Don't do funny casts to avoid compiler warnings
2008-07-18 Federico Mena Quintero <federico@novell.com> * demos/gtk-demo/changedisplay.c (find_toplevel_at_pointer): Don't do funny casts to avoid compiler warnings. * demos/gtk-demo/textview.c (easter_egg_callback): Likewise. * gtk/gtkmain.c (rewrite_event_for_grabs, gtk_get_event_widget): Likewise. * gtk/gtkmodules.c (load_module): Likewise. * gtk/gtkselection.c (gtk_selection_convert): Likewise. * gtk/gtktipsquery.c (gtk_tips_query_event): Likewise. * gtk/queryimmodules.c (query_module): Likewise. * tests/testgtk.c (create_gridded_geometry, create_key_lookup) (find_widget_at_pointer): Likewise. Signed-off-by: Federico Mena Quintero <federico@novell.com> svn path=/trunk/; revision=20862
This commit is contained in:
committed by
Federico Mena Quintero
parent
cf68d46c64
commit
0278fdcbc2
@ -2401,6 +2401,7 @@ static void
|
||||
create_gridded_geometry (GtkWidget *widget)
|
||||
{
|
||||
static GtkWidget *window = NULL;
|
||||
gpointer window_ptr;
|
||||
GtkWidget *entry;
|
||||
GtkWidget *label;
|
||||
|
||||
@ -2424,7 +2425,8 @@ create_gridded_geometry (GtkWidget *widget)
|
||||
|
||||
g_signal_connect (window, "response",
|
||||
G_CALLBACK (gridded_geometry_response), entry);
|
||||
g_object_add_weak_pointer (G_OBJECT (window), (gpointer) &window);
|
||||
window_ptr = &window;
|
||||
g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
|
||||
|
||||
gtk_widget_show_all (window);
|
||||
}
|
||||
@ -4779,6 +4781,7 @@ static void
|
||||
create_key_lookup (GtkWidget *widget)
|
||||
{
|
||||
static GtkWidget *window = NULL;
|
||||
gpointer window_ptr;
|
||||
|
||||
if (!window)
|
||||
{
|
||||
@ -4826,8 +4829,9 @@ create_key_lookup (GtkWidget *widget)
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
|
||||
button = accel_button_new (accel_group, "Button 15", "<Shift><Mod4>b");
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), button, FALSE, FALSE, 0);
|
||||
|
||||
g_object_add_weak_pointer (G_OBJECT (window), (gpointer) &window);
|
||||
|
||||
window_ptr = &window;
|
||||
g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
|
||||
g_signal_connect (window, "response", G_CALLBACK (gtk_object_destroy), NULL);
|
||||
|
||||
gtk_widget_show_all (window);
|
||||
@ -12030,7 +12034,12 @@ find_widget_at_pointer (GdkDisplay *display)
|
||||
pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
|
||||
|
||||
if (pointer_window)
|
||||
gdk_window_get_user_data (pointer_window, (gpointer) &widget);
|
||||
{
|
||||
gpointer widget_ptr;
|
||||
|
||||
gdk_window_get_user_data (pointer_window, &widget_ptr);
|
||||
widget = widget_ptr;
|
||||
}
|
||||
|
||||
if (widget)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user