Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid some compiler warnings (#507000).

Browse Source 
* gtk/gtkbuilder.c, gtk/gtkbuilderprivate.h: Use proper sign
for value argument of _gtk_builder_flags_from_string.
* gtk/gtkwidget.c: Don't alias the child pointer passed
to gdk_window_get_user_data.

svn path=/trunk/; revision=19306
This commit is contained in:
Mathias Hasselmann
2008-01-05 08:33:53 +00:00
parent 3db2d18042
commit 26124bb10b
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2008-01-04 Mathias Hasselmann <mathias@openismus.com>
Avoid some compiler warnings (#507000).
* gtk/gtkbuilder.c, gtk/gtkbuilderprivate.h: Use proper sign
for value argument of _gtk_builder_flags_from_string.
* gtk/gtkwidget.c: Don't alias the child pointer passed
to gdk_window_get_user_data.
2008-01-04 Michael Natterer <mitch@imendio.com>
* gdk/x11/gdkinput-x11.c (_gdk_device_get_history): don't forget

5
gtk/gtkbuilder.c
View File

@@ -1111,7 +1111,8 @@ gtk_builder_value_from_string_type (GtkBuilder *builder,
}
case G_TYPE_FLAGS:
{
gint flags_value;
guint flags_value;
if (!_gtk_builder_flags_from_string (type, string, &flags_value, error))
{
ret = FALSE;
@@ -1293,7 +1294,7 @@ _gtk_builder_enum_from_string (GType type,
gboolean
_gtk_builder_flags_from_string (GType type,
const gchar *string,
gint *flags_value,
guint *flags_value,
GError **error)
{
GFlagsClass *fclass;

2
gtk/gtkbuilderprivate.h
View File

@@ -116,7 +116,7 @@ gboolean _gtk_builder_boolean_from_string (const gchar *string,
GError **error);
gboolean _gtk_builder_flags_from_string (GType type,
const char *string,
gint *value,
guint *value,
GError **error);
#endif /* __GTK_BUILDER_PRIVATE_H__ */

13
gtk/gtkwidget.c
View File

@@ -4762,12 +4762,12 @@ gtk_widget_reparent_subwindows (GtkWidget *widget,
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
{
GtkWidget *child;
GdkWindow *window = tmp_list->data;
gpointer child;
gdk_window_get_user_data (window, (void **)&child);
gdk_window_get_user_data (window, &child);
while (child && child != widget)
child = child->parent;
child = ((GtkWidget*) child)->parent;
if (child)
gdk_window_reparent (window, new_window, 0, 0);
@@ -4790,10 +4790,11 @@ gtk_widget_reparent_subwindows (GtkWidget *widget,
for (tmp_list = children; tmp_list; tmp_list = tmp_list->next)
{
GtkWidget *child;
GdkWindow *window = tmp_list->data;
gdk_window_get_user_data (window, (void **)&child);
gpointer child;
gdk_window_get_user_data (window, &child);
if (child == widget)
gdk_window_reparent (window, new_window, 0, 0);
}