forked from AuroraMiddleware/gtk
Use GdkModifierType instedd of guint, to avoid a gcc warning.
2008-06-19 Johan Dahlin <jdahlin@async.com.br> * gtk/gtkactiongroup.c: Use GdkModifierType instedd of guint, to avoid a gcc warning. svn path=/trunk/; revision=20459
This commit is contained in:
parent
ad54e22fc7
commit
94e207777d
@ -1,3 +1,8 @@
|
|||||||
|
2008-06-19 Johan Dahlin <jdahlin@async.com.br>
|
||||||
|
|
||||||
|
* gtk/gtkactiongroup.c: Use GdkModifierType instedd of guint,
|
||||||
|
to avoid a gcc warning.
|
||||||
|
|
||||||
2008-06-18 Olle Bergkvist <olle.bergkvist@yahoo.se>
|
2008-06-18 Olle Bergkvist <olle.bergkvist@yahoo.se>
|
||||||
|
|
||||||
http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change
|
http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change
|
||||||
|
@ -341,9 +341,9 @@ gtk_action_group_buildable_get_name (GtkBuildable *buildable)
|
|||||||
}
|
}
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
GObject *child;
|
GObject *child;
|
||||||
guint key;
|
guint key;
|
||||||
guint modifiers;
|
GdkModifierType modifiers;
|
||||||
} AcceleratorParserData;
|
} AcceleratorParserData;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -356,7 +356,7 @@ accelerator_start_element (GMarkupParseContext *context,
|
|||||||
{
|
{
|
||||||
gint i;
|
gint i;
|
||||||
guint key = 0;
|
guint key = 0;
|
||||||
gint modifiers = 0;
|
GdkModifierType modifiers = 0;
|
||||||
AcceleratorParserData *parser_data = (AcceleratorParserData*)user_data;
|
AcceleratorParserData *parser_data = (AcceleratorParserData*)user_data;
|
||||||
|
|
||||||
if (strcmp (element_name, "accelerator") != 0)
|
if (strcmp (element_name, "accelerator") != 0)
|
||||||
@ -382,7 +382,7 @@ accelerator_start_element (GMarkupParseContext *context,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
parser_data->key = key;
|
parser_data->key = key;
|
||||||
parser_data->modifiers = (guint)modifiers;
|
parser_data->modifiers = modifiers;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const GMarkupParser accelerator_parser =
|
static const GMarkupParser accelerator_parser =
|
||||||
|
Loading…
Reference in New Issue
Block a user