mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 468804 - casting to pointer explicitely in g_object_set_data() calls; r+sr=roc

This commit is contained in:
Wolfgang Rosenauer 2008-12-10 16:53:28 +01:00
Родитель 843b91dd45
Коммит 1904170050
1 изменённых файлов: 18 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
widget/src/gtk2/gtk2drawing.c
Просмотреть файл

@ -142,7 +142,7 @@ setup_widget_prototype(GtkWidget* widget)
gtk_container_add(GTK_CONTAINER(protoLayout), widget); gtk_container_add(GTK_CONTAINER(protoLayout), widget);
gtk_widget_realize(widget); gtk_widget_realize(widget);
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -287,7 +287,7 @@ moz_gtk_get_combo_box_inner_button(GtkWidget *widget, gpointer client_data)
g_object_add_weak_pointer(G_OBJECT(widget), g_object_add_weak_pointer(G_OBJECT(widget),
(gpointer) &gComboBoxButtonWidget); (gpointer) &gComboBoxButtonWidget);
gtk_widget_realize(widget); gtk_widget_realize(widget);
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
} }
@ -306,7 +306,7 @@ moz_gtk_get_combo_box_button_inner_widgets(GtkWidget *widget,
} else } else
return; return;
gtk_widget_realize(widget); gtk_widget_realize(widget);
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
static gint static gint
@ -347,7 +347,7 @@ ensure_combo_box_widgets()
&gComboBoxArrowWidget); &gComboBoxArrowWidget);
gtk_widget_realize(gComboBoxArrowWidget); gtk_widget_realize(gComboBoxArrowWidget);
g_object_set_data(G_OBJECT(gComboBoxArrowWidget), g_object_set_data(G_OBJECT(gComboBoxArrowWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
} else { } else {
/* Shouldn't be reached with current internal gtk implementation; we /* Shouldn't be reached with current internal gtk implementation; we
@ -397,7 +397,7 @@ moz_gtk_get_combo_box_entry_inner_widgets(GtkWidget *widget,
} else } else
return; return;
gtk_widget_realize(widget); gtk_widget_realize(widget);
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
static void static void
@ -408,7 +408,7 @@ moz_gtk_get_combo_box_entry_arrow(GtkWidget *widget, gpointer client_data)
g_object_add_weak_pointer(G_OBJECT(widget), g_object_add_weak_pointer(G_OBJECT(widget),
(gpointer) &gComboBoxEntryArrowWidget); (gpointer) &gComboBoxEntryArrowWidget);
gtk_widget_realize(widget); gtk_widget_realize(widget);
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
} }
@ -460,7 +460,7 @@ ensure_combo_box_entry_widgets()
&gComboBoxEntryArrowWidget); &gComboBoxEntryArrowWidget);
gtk_widget_realize(gComboBoxEntryArrowWidget); gtk_widget_realize(gComboBoxEntryArrowWidget);
g_object_set_data(G_OBJECT(gComboBoxEntryArrowWidget), g_object_set_data(G_OBJECT(gComboBoxEntryArrowWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
} else { } else {
/* Shouldn't be reached with current internal gtk implementation; /* Shouldn't be reached with current internal gtk implementation;
@ -500,7 +500,7 @@ ensure_toolbar_widget()
gToolbarWidget = gtk_toolbar_new(); gToolbarWidget = gtk_toolbar_new();
gtk_container_add(GTK_CONTAINER(gHandleBoxWidget), gToolbarWidget); gtk_container_add(GTK_CONTAINER(gHandleBoxWidget), gToolbarWidget);
gtk_widget_realize(gToolbarWidget); gtk_widget_realize(gToolbarWidget);
g_object_set_data(G_OBJECT(gToolbarWidget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(gToolbarWidget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -589,7 +589,7 @@ ensure_menu_bar_item_widget()
gMenuBarItemWidget); gMenuBarItemWidget);
gtk_widget_realize(gMenuBarItemWidget); gtk_widget_realize(gMenuBarItemWidget);
g_object_set_data(G_OBJECT(gMenuBarItemWidget), g_object_set_data(G_OBJECT(gMenuBarItemWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -604,7 +604,7 @@ ensure_menu_popup_widget()
gMenuPopupWidget); gMenuPopupWidget);
gtk_widget_realize(gMenuPopupWidget); gtk_widget_realize(gMenuPopupWidget);
g_object_set_data(G_OBJECT(gMenuPopupWidget), g_object_set_data(G_OBJECT(gMenuPopupWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -619,7 +619,7 @@ ensure_menu_item_widget()
gMenuItemWidget); gMenuItemWidget);
gtk_widget_realize(gMenuItemWidget); gtk_widget_realize(gMenuItemWidget);
g_object_set_data(G_OBJECT(gMenuItemWidget), g_object_set_data(G_OBJECT(gMenuItemWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -634,7 +634,7 @@ ensure_image_menu_item_widget()
gImageMenuItemWidget); gImageMenuItemWidget);
gtk_widget_realize(gImageMenuItemWidget); gtk_widget_realize(gImageMenuItemWidget);
g_object_set_data(G_OBJECT(gImageMenuItemWidget), g_object_set_data(G_OBJECT(gImageMenuItemWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -649,7 +649,7 @@ ensure_menu_separator_widget()
gMenuSeparatorWidget); gMenuSeparatorWidget);
gtk_widget_realize(gMenuSeparatorWidget); gtk_widget_realize(gMenuSeparatorWidget);
g_object_set_data(G_OBJECT(gMenuSeparatorWidget), g_object_set_data(G_OBJECT(gMenuSeparatorWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -664,7 +664,7 @@ ensure_check_menu_item_widget()
gCheckMenuItemWidget); gCheckMenuItemWidget);
gtk_widget_realize(gCheckMenuItemWidget); gtk_widget_realize(gCheckMenuItemWidget);
g_object_set_data(G_OBJECT(gCheckMenuItemWidget), g_object_set_data(G_OBJECT(gCheckMenuItemWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -719,9 +719,9 @@ ensure_tree_header_cell_widget()
gTreeHeaderCellWidget = GTK_TREE_VIEW_COLUMN(gMiddleTreeViewColumn)->button; gTreeHeaderCellWidget = GTK_TREE_VIEW_COLUMN(gMiddleTreeViewColumn)->button;
gTreeHeaderSortArrowWidget = GTK_TREE_VIEW_COLUMN(gMiddleTreeViewColumn)->arrow; gTreeHeaderSortArrowWidget = GTK_TREE_VIEW_COLUMN(gMiddleTreeViewColumn)->arrow;
g_object_set_data(G_OBJECT(gTreeHeaderCellWidget), g_object_set_data(G_OBJECT(gTreeHeaderCellWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
g_object_set_data(G_OBJECT(gTreeHeaderSortArrowWidget), g_object_set_data(G_OBJECT(gTreeHeaderSortArrowWidget),
"transparent-bg-hint", TRUE); "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} }
return MOZ_GTK_SUCCESS; return MOZ_GTK_SUCCESS;
} }
@ -1533,11 +1533,11 @@ moz_gtk_entry_paint(GdkDrawable* drawable, GdkRectangle* rect,
* If the theme is able to cope with transparency, then we can skip pre-filling * If the theme is able to cope with transparency, then we can skip pre-filling
* and notify the theme it will paint directly on the canvas. */ * and notify the theme it will paint directly on the canvas. */
if (theme_honors_transparency) { if (theme_honors_transparency) {
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", TRUE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(TRUE));
} else { } else {
gdk_draw_rectangle(drawable, style->base_gc[bg_state], TRUE, gdk_draw_rectangle(drawable, style->base_gc[bg_state], TRUE,
cliprect->x, cliprect->y, cliprect->width, cliprect->height); cliprect->x, cliprect->y, cliprect->width, cliprect->height);
g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", FALSE); g_object_set_data(G_OBJECT(widget), "transparent-bg-hint", GINT_TO_POINTER(FALSE));
} }
/* Get the position of the inner window, see _gtk_entry_get_borders */ /* Get the position of the inner window, see _gtk_entry_get_borders */