Commit 32b4a465 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

expose-event returns gboolean not gint, reindented static prototypes and

2008-09-03  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkarrow.c: expose-event returns gboolean not gint,
	reindented static prototypes and did some minor cleanups.


svn path=/trunk/; revision=21265
parent d5169737
2008-09-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkarrow.c: expose-event returns gboolean not gint,
reindented static prototypes and did some minor cleanups.
2008-09-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c: some more trivial cosmetic fixes.
......
......@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2001. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
......@@ -40,16 +40,16 @@ enum {
};
static gint gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event);
static void gtk_arrow_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
static void gtk_arrow_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
static void gtk_arrow_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
static void gtk_arrow_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
static gboolean gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event);
G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
......@@ -67,6 +67,8 @@ gtk_arrow_class_init (GtkArrowClass *class)
gobject_class->set_property = gtk_arrow_set_property;
gobject_class->get_property = gtk_arrow_get_property;
widget_class->expose_event = gtk_arrow_expose;
g_object_class_install_property (gobject_class,
PROP_ARROW_TYPE,
g_param_spec_enum ("arrow-type",
......@@ -75,6 +77,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
GTK_TYPE_ARROW_TYPE,
GTK_ARROW_RIGHT,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE,
g_param_spec_enum ("shadow-type",
......@@ -83,14 +86,13 @@ gtk_arrow_class_init (GtkArrowClass *class)
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_OUT,
GTK_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_float ("arrow-scaling",
P_("Arrow Scaling"),
P_("Amount of space used up by arrow"),
0.0, 1.0, 0.7,
GTK_PARAM_READABLE));
widget_class->expose_event = gtk_arrow_expose;
}
static void
......@@ -99,9 +101,7 @@ gtk_arrow_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GtkArrow *arrow;
arrow = GTK_ARROW (object);
GtkArrow *arrow = GTK_ARROW (object);
switch (prop_id)
{
......@@ -121,16 +121,14 @@ gtk_arrow_set_property (GObject *object,
}
}
static void
gtk_arrow_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GtkArrow *arrow;
arrow = GTK_ARROW (object);
GtkArrow *arrow = GTK_ARROW (object);
switch (prop_id)
{
case PROP_ARROW_TYPE:
......@@ -203,22 +201,22 @@ gtk_arrow_set (GtkArrow *arrow,
}
static gboolean
static gboolean
gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkShadowType shadow_type;
gint width, height;
gint x, y;
gint extent;
gfloat xalign;
GtkArrowType effective_arrow_type;
if (GTK_WIDGET_DRAWABLE (widget))
{
GtkArrow *arrow = GTK_ARROW (widget);
GtkMisc *misc = GTK_MISC (widget);
GtkShadowType shadow_type;
gint width, height;
gint x, y;
gint extent;
gfloat xalign;
GtkArrowType effective_arrow_type;
gfloat arrow_scaling;
gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
width = widget->allocation.width - misc->xpad * 2;
......@@ -239,9 +237,9 @@ gtk_arrow_expose (GtkWidget *widget,
x = floor (widget->allocation.x + misc->xpad
+ ((widget->allocation.width - extent) * xalign));
y = floor (widget->allocation.y + misc->ypad
y = floor (widget->allocation.y + misc->ypad
+ ((widget->allocation.height - extent) * misc->yalign));
shadow_type = arrow->shadow_type;
if (widget->state == GTK_STATE_ACTIVE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment