AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michael Natterer 2008-09-03 15:09:17 +00:00 committed by Michael Natterer
parent d516973764
commit 32b4a4658b
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2008-09-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c: some more trivial cosmetic fixes. * gtk/gtkmenu.c: some more trivial cosmetic fixes.

58
gtk/gtkarrow.c
View File

@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2001. See the AUTHORS * 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 * file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with * 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" #include "config.h"
@ -40,16 +40,16 @@ enum {
}; };
static gint gtk_arrow_expose (GtkWidget *widget, static void gtk_arrow_set_property (GObject *object,
GdkEventExpose *event); guint prop_id,
static void gtk_arrow_set_property (GObject *object, const GValue *value,
guint prop_id, GParamSpec *pspec);
const GValue *value, static void gtk_arrow_get_property (GObject *object,
GParamSpec *pspec); guint prop_id,
static void gtk_arrow_get_property (GObject *object, GValue *value,
guint prop_id, GParamSpec *pspec);
GValue *value, static gboolean gtk_arrow_expose (GtkWidget *widget,
GParamSpec *pspec); GdkEventExpose *event);
G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC) 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->set_property = gtk_arrow_set_property;
gobject_class->get_property = gtk_arrow_get_property; gobject_class->get_property = gtk_arrow_get_property;
widget_class->expose_event = gtk_arrow_expose;
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ARROW_TYPE, PROP_ARROW_TYPE,
g_param_spec_enum ("arrow-type", g_param_spec_enum ("arrow-type",
@ -75,6 +77,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
GTK_TYPE_ARROW_TYPE, GTK_TYPE_ARROW_TYPE,
GTK_ARROW_RIGHT, GTK_ARROW_RIGHT,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE, PROP_SHADOW_TYPE,
g_param_spec_enum ("shadow-type", g_param_spec_enum ("shadow-type",
@ -83,14 +86,13 @@ gtk_arrow_class_init (GtkArrowClass *class)
GTK_TYPE_SHADOW_TYPE, GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_OUT, GTK_SHADOW_OUT,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_float ("arrow-scaling", g_param_spec_float ("arrow-scaling",
P_("Arrow Scaling"), P_("Arrow Scaling"),
P_("Amount of space used up by arrow"), P_("Amount of space used up by arrow"),
0.0, 1.0, 0.7, 0.0, 1.0, 0.7,
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
widget_class->expose_event = gtk_arrow_expose;
} }
static void static void
@ -99,9 +101,7 @@ gtk_arrow_set_property (GObject *object,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkArrow *arrow; GtkArrow *arrow = GTK_ARROW (object);
arrow = GTK_ARROW (object);
switch (prop_id) switch (prop_id)
{ {
@ -121,16 +121,14 @@ gtk_arrow_set_property (GObject *object,
} }
} }
static void static void
gtk_arrow_get_property (GObject *object, gtk_arrow_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkArrow *arrow; GtkArrow *arrow = GTK_ARROW (object);
arrow = GTK_ARROW (object);
switch (prop_id) switch (prop_id)
{ {
case PROP_ARROW_TYPE: case PROP_ARROW_TYPE:
@ -203,22 +201,22 @@ gtk_arrow_set (GtkArrow *arrow,
} }
static gboolean static gboolean
gtk_arrow_expose (GtkWidget *widget, gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
GtkShadowType shadow_type;
gint width, height;
gint x, y;
gint extent;
gfloat xalign;
GtkArrowType effective_arrow_type;
if (GTK_WIDGET_DRAWABLE (widget)) if (GTK_WIDGET_DRAWABLE (widget))
{ {
GtkArrow *arrow = GTK_ARROW (widget); GtkArrow *arrow = GTK_ARROW (widget);
GtkMisc *misc = GTK_MISC (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; gfloat arrow_scaling;
gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL); gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
width = widget->allocation.width - misc->xpad * 2; width = widget->allocation.width - misc->xpad * 2;
@ -239,9 +237,9 @@ gtk_arrow_expose (GtkWidget *widget,
x = floor (widget->allocation.x + misc->xpad x = floor (widget->allocation.x + misc->xpad
+ ((widget->allocation.width - extent) * xalign)); + ((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)); + ((widget->allocation.height - extent) * misc->yalign));
shadow_type = arrow->shadow_type; shadow_type = arrow->shadow_type;
if (widget->state == GTK_STATE_ACTIVE) if (widget->state == GTK_STATE_ACTIVE)