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

Don't use GTK_WIDGET_*SET_FLAGS (wid, GTK_REALIZED)

Browse Source 
Use new API instead: gtk_widget_set_realized ()

https://bugzilla.gnome.org/show_bug.cgi?id=69872
This commit is contained in:
Javier Jardón 2010-03-06 11:51:33 +01:00
parent 24bafd8693
commit 1934de4b65
47 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/offscreen_window.c
View File

@ -229,7 +229,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
gint border_width;
GtkRequisition child_requisition;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

2
demos/gtk-demo/offscreen_window2.c
View File

@ -167,7 +167,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
gint border_width;
GtkRequisition child_requisition;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

4
docs/tutorial/gtk-tut.sgml
View File

@ -11925,7 +11925,7 @@ gtk_dial_realize (GtkWidget *widget)
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DIAL (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
dial = GTK_DIAL (widget);
attributes.x = widget->allocation.x;
@ -15113,7 +15113,7 @@ gtk_dial_realize (GtkWidget *widget)
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DIAL (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
dial = GTK_DIAL (widget);
attributes.x = widget->allocation.x;

2
examples/gtkdial/gtkdial.c
View File

@ -214,7 +214,7 @@ gtk_dial_realize (GtkWidget *widget)
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DIAL (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
dial = GTK_DIAL (widget);
attributes.x = widget->allocation.x;

2
gtk/gtkbutton.c
View File

@ -1175,7 +1175,7 @@ gtk_button_realize (GtkWidget *widget)
gint border_width;
button = GTK_BUTTON (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

2
gtk/gtkcalendar.c
View File

@ -1572,7 +1572,7 @@ gtk_calendar_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;

2
gtk/gtkclist.c
View File

@ -4458,7 +4458,7 @@ gtk_clist_realize (GtkWidget *widget)
clist = GTK_CLIST (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

2
gtk/gtkdrawingarea.c
View File

@ -85,7 +85,7 @@ gtk_drawing_area_realize (GtkWidget *widget)
}
else
{
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtkentry.c
View File

@ -2753,7 +2753,7 @@ gtk_entry_realize (GtkWidget *widget)
gint attributes_mask;
int i;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
entry = GTK_ENTRY (widget);
priv = GTK_ENTRY_GET_PRIVATE (entry);

2
gtk/gtkeventbox.c
View File

@ -372,7 +372,7 @@ gtk_event_box_realize (GtkWidget *widget)
GtkEventBoxPrivate *priv;
gboolean visible_window;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

2
gtk/gtkexpander.c
View File

@ -403,7 +403,7 @@ gtk_expander_realize (GtkWidget *widget)
gint label_height;
priv = GTK_EXPANDER (widget)->priv;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

2
gtk/gtkfixed.c
View File

@ -277,7 +277,7 @@ gtk_fixed_realize (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_fixed_parent_class)->realize (widget);
else
{
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtkhandlebox.c
View File

@ -394,7 +394,7 @@ gtk_handle_box_realize (GtkWidget *widget)
hb = GTK_HANDLE_BOX (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;

2
gtk/gtkhsv.c
View File

@ -279,7 +279,7 @@ gtk_hsv_realize (GtkWidget *widget)
hsv = GTK_HSV (widget);
priv = hsv->priv;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
/* Create window */

2
gtk/gtkiconview.c
View File

@ -1318,7 +1318,7 @@ gtk_icon_view_realize (GtkWidget *widget)
icon_view = GTK_ICON_VIEW (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
/* Make the main, clipping window */
attributes.window_type = GDK_WINDOW_CHILD;

2
gtk/gtkinvisible.c
View File

@ -218,7 +218,7 @@ gtk_invisible_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
parent = gtk_widget_get_parent_window (widget);
if (parent == NULL)

2
gtk/gtkitem.c
View File

@ -125,7 +125,7 @@ gtk_item_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;

2
gtk/gtklayout.c
View File

@ -847,7 +847,7 @@ gtk_layout_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (layout, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtklist.c
View File

@ -451,7 +451,7 @@ gtk_list_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtklistitem.c
View File

@ -431,7 +431,7 @@ gtk_list_item_realize (GtkWidget *widget)
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;

2
gtk/gtkmenu.c
View File

@ -2263,7 +2263,7 @@ gtk_menu_realize (GtkWidget *widget)
menu = GTK_MENU (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtkmenuitem.c
View File

@ -1129,7 +1129,7 @@ gtk_menu_item_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
widget->window = gtk_widget_get_parent_window (widget);
g_object_ref (widget->window);

2
gtk/gtkmenushell.c
View File

@ -513,7 +513,7 @@ gtk_menu_shell_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;

2
gtk/gtkmisc.c
View File

@ -308,7 +308,7 @@ gtk_misc_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
if (!gtk_widget_get_has_window (widget))
{

3
gtk/gtknotebook.c
View File

@ -1798,7 +1798,8 @@ gtk_notebook_realize (GtkWidget *widget)
GdkRectangle event_window_pos;
notebook = GTK_NOTEBOOK (widget);
GTK_WIDGET_SET_FLAGS (notebook, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
gtk_notebook_get_event_window_position (notebook, &event_window_pos);

2
gtk/gtkoffscreenwindow.c
View File

@ -125,7 +125,7 @@ gtk_offscreen_window_realize (GtkWidget *widget)
bin = GTK_BIN (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));

2
gtk/gtkpaned.c
View File

@ -978,7 +978,7 @@ gtk_paned_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
paned = GTK_PANED (widget);
widget->window = gtk_widget_get_parent_window (widget);

2
gtk/gtkpathbar.c
View File

@ -408,7 +408,7 @@ gtk_path_bar_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
path_bar = GTK_PATH_BAR (widget);
widget->window = gtk_widget_get_parent_window (widget);

2
gtk/gtkplug.c
View File

@ -607,7 +607,7 @@ gtk_plug_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD; /* XXX GDK_WINDOW_PLUG ? */
attributes.title = window->title;

2
gtk/gtkpreview.c
View File

@ -420,7 +420,7 @@ gtk_preview_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;

2
gtk/gtkprogress.c
View File

@ -212,7 +212,7 @@ gtk_progress_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtkrange.c
View File

@ -1495,7 +1495,7 @@ gtk_range_realize (GtkWidget *widget)
gtk_range_calc_layout (range, range->adjustment->value);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
widget->window = gtk_widget_get_parent_window (widget);
g_object_ref (widget->window);

3
gtk/gtkruler.c
View File

@ -441,7 +441,8 @@ gtk_ruler_realize (GtkWidget *widget)
gint attributes_mask;
ruler = GTK_RULER (widget);
GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

4
gtk/gtksocket.c
View File

@ -326,7 +326,7 @@ gtk_socket_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
@ -390,7 +390,7 @@ gtk_socket_unrealize (GtkWidget *widget)
{
GtkSocket *socket = GTK_SOCKET (widget);
GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, FALSE);
if (socket->plug_widget)
{

2
gtk/gtktext.c
View File

@ -1239,7 +1239,7 @@ gtk_text_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (text, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

3
gtk/gtktextview.c
View File

@ -3827,7 +3827,8 @@ gtk_text_view_realize (GtkWidget *widget)
GSList *tmp_list;
text_view = GTK_TEXT_VIEW (widget);
GTK_WIDGET_SET_FLAGS (text_view, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtktoolbar.c
View File

@ -813,7 +813,7 @@ gtk_toolbar_realize (GtkWidget *widget)
gint attributes_mask;
gint border_width;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;

2
gtk/gtktoolitem.c
View File

@ -462,7 +462,7 @@ gtk_tool_item_realize (GtkWidget *widget)
GtkToolItem *toolitem;
toolitem = GTK_TOOL_ITEM (widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
widget->window = gtk_widget_get_parent_window (widget);
g_object_ref (widget->window);

2
gtk/gtktoolitemgroup.c
View File

@ -1181,7 +1181,7 @@ gtk_tool_item_group_realize (GtkWidget *widget)
gdk_window_set_user_data (widget->window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
gtk_container_forall (GTK_CONTAINER (widget),
(GtkCallback) gtk_widget_set_parent_window,

2
gtk/gtktoolpalette.c
View File

@ -672,7 +672,7 @@ gtk_tool_palette_realize (GtkWidget *widget)
gdk_window_set_user_data (widget->window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
gtk_container_forall (GTK_CONTAINER (widget),
(GtkCallback) gtk_widget_set_parent_window,

2
gtk/gtktree.c
View File

@ -560,7 +560,7 @@ gtk_tree_realize (GtkWidget *widget)
g_return_if_fail (GTK_IS_TREE (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;

2
gtk/gtktreeview.c
View File

@ -1767,7 +1767,7 @@ gtk_tree_view_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
/* Make the main, clipping window */
attributes.window_type = GDK_WINDOW_CHILD;

2
gtk/gtkviewport.c
View File

@ -588,7 +588,7 @@ gtk_viewport_realize (GtkWidget *widget)
gint attributes_mask;
gint event_mask;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.x = widget->allocation.x + border_width;
attributes.y = widget->allocation.y + border_width;

8
gtk/gtkwidget.c
View File

@ -5989,9 +5989,9 @@ gtk_widget_set_realized (GtkWidget *widget,
g_return_if_fail (GTK_IS_WIDGET (widget));
if (realized)
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
GTK_OBJECT_FLAGS (widget) |= GTK_REALIZED;
else
GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
GTK_OBJECT_FLAGS (widget) &= ~(GTK_REALIZED);
}
/**
@ -8793,7 +8793,7 @@ gtk_widget_real_realize (GtkWidget *widget)
{
g_assert (!gtk_widget_get_has_window (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
if (widget->parent)
{
widget->window = gtk_widget_get_parent_window (widget);
@ -8847,7 +8847,7 @@ gtk_widget_real_unrealize (GtkWidget *widget)
gtk_selection_remove_all (widget);
GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, FALSE);
}
static void

2
gtk/gtkwin32embedwidget.c
View File

@ -200,7 +200,7 @@ gtk_win32_embed_widget_realize (GtkWidget *widget)
g_return_if_fail (!gtk_widget_get_realized (widget));
}
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.title = window->title;

2
gtk/gtkwindow.c
View File

@ -4742,7 +4742,7 @@ gtk_window_realize (GtkWidget *widget)
g_return_if_fail (!gtk_widget_get_realized (widget));
}
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
switch (window->type)
{

2
tests/gtkoffscreenbox.c
View File

@ -238,7 +238,7 @@ gtk_offscreen_box_realize (GtkWidget *widget)
GtkRequisition child_requisition;
int start_y = 0;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
gtk_widget_set_realized (widget, TRUE);
border_width = GTK_CONTAINER (widget)->border_width;