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

dunno, what cvs wants right now. i just told me these

Browse Source 
changes are already commited... ;(
-timj
This commit is contained in:
Tim Janik 1998-02-02 21:41:24 +00:00
parent b239e3c941
commit fc86f630a6
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcontainer.c
View File

@ -224,7 +224,7 @@ gtk_container_destroy (GtkObject *object)
GtkWidget *child; GtkWidget *child;
child = (GtkWidget*) node->data; child = (GtkWidget*) node->data;
GTK_PRIVATE_UNSET_FLAGS (child, GTK_RESIZE_NEEDED); GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED);
} }
g_slist_free (GTK_CONTAINER (object)->resize_widgets); g_slist_free (GTK_CONTAINER (object)->resize_widgets);
GTK_CONTAINER (object)->resize_widgets = NULL; GTK_CONTAINER (object)->resize_widgets = NULL;

4
gtk/gtkmain.c
View File

@ -440,14 +440,14 @@ gtk_main_iteration_do (gboolean blocking)
{ {
gtk_widget_event (grab_widget, event); gtk_widget_event (grab_widget, event);
if (event_widget == grab_widget) if (event_widget == grab_widget)
GTK_PRIVATE_SET_FLAGS (event_widget, GTK_LEAVE_PENDING); GTK_PRIVATE_SET_FLAG (event_widget, GTK_LEAVE_PENDING);
} }
break; break;
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
if (event_widget && GTK_WIDGET_LEAVE_PENDING (event_widget)) if (event_widget && GTK_WIDGET_LEAVE_PENDING (event_widget))
{ {
GTK_PRIVATE_UNSET_FLAGS (event_widget, GTK_LEAVE_PENDING); GTK_PRIVATE_UNSET_FLAG (event_widget, GTK_LEAVE_PENDING);
gtk_widget_event (event_widget, event); gtk_widget_event (event_widget, event);
} }
else if (grab_widget && GTK_WIDGET_IS_SENSITIVE (grab_widget)) else if (grab_widget && GTK_WIDGET_IS_SENSITIVE (grab_widget))

4
gtk/gtkprivate.h
View File

@ -57,8 +57,8 @@ enum
* we use a preprocessor string concatenation here for a clear * we use a preprocessor string concatenation here for a clear
* flags/private_flags distinction at the cost of single flag operations. * flags/private_flags distinction at the cost of single flag operations.
*/ */
#define GTK_PRIVATE_SET_FLAGS(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END #define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
#define GTK_PRIVATE_UNSET_FLAGS(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END #define GTK_PRIVATE_UNSET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END

28
gtk/gtkwidget.c
View File

@ -1218,7 +1218,7 @@ gtk_widget_hide_all (GtkWidget *widget)
if (toplevel != widget) if (toplevel != widget)
GTK_CONTAINER (toplevel)->resize_widgets = GTK_CONTAINER (toplevel)->resize_widgets =
g_slist_remove (GTK_CONTAINER (toplevel)->resize_widgets, widget); g_slist_remove (GTK_CONTAINER (toplevel)->resize_widgets, widget);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_NEEDED); GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
} }
widget_class = GTK_WIDGET_CLASS(GTK_OBJECT(widget)->klass); widget_class = GTK_WIDGET_CLASS(GTK_OBJECT(widget)->klass);
@ -1386,7 +1386,7 @@ gtk_widget_queue_draw (GtkWidget *widget)
parent = parent->parent; parent = parent->parent;
} }
GTK_PRIVATE_SET_FLAGS (widget, GTK_REDRAW_PENDING); GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING);
if (gtk_widget_redraw_queue == NULL) if (gtk_widget_redraw_queue == NULL)
gtk_idle_add ((GtkFunction) gtk_widget_idle_draw, NULL); gtk_idle_add ((GtkFunction) gtk_widget_idle_draw, NULL);
@ -1432,7 +1432,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
{ {
if (!GTK_CONTAINER_RESIZE_PENDING (toplevel)) if (!GTK_CONTAINER_RESIZE_PENDING (toplevel))
{ {
GTK_PRIVATE_SET_FLAGS (toplevel, GTK_RESIZE_PENDING); GTK_PRIVATE_SET_FLAG (toplevel, GTK_RESIZE_PENDING);
if (gtk_widget_resize_queue == NULL) if (gtk_widget_resize_queue == NULL)
gtk_idle_add ((GtkFunction) gtk_widget_idle_sizer, NULL); gtk_idle_add ((GtkFunction) gtk_widget_idle_sizer, NULL);
gtk_widget_resize_queue = g_slist_prepend (gtk_widget_resize_queue, toplevel); gtk_widget_resize_queue = g_slist_prepend (gtk_widget_resize_queue, toplevel);
@ -1440,7 +1440,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
if (!GTK_WIDGET_RESIZE_NEEDED (widget)) if (!GTK_WIDGET_RESIZE_NEEDED (widget))
{ {
GTK_PRIVATE_SET_FLAGS (widget, GTK_RESIZE_NEEDED); GTK_PRIVATE_SET_FLAG (widget, GTK_RESIZE_NEEDED);
GTK_CONTAINER (toplevel)->resize_widgets = GTK_CONTAINER (toplevel)->resize_widgets =
g_slist_prepend (GTK_CONTAINER (toplevel)->resize_widgets, widget); g_slist_prepend (GTK_CONTAINER (toplevel)->resize_widgets, widget);
} }
@ -1871,7 +1871,7 @@ gtk_widget_reparent (GtkWidget *widget,
{ {
/* Set a flag so that gtk_widget_unparent doesn't unrealize widget /* Set a flag so that gtk_widget_unparent doesn't unrealize widget
*/ */
GTK_PRIVATE_SET_FLAGS (widget, GTK_IN_REPARENT); GTK_PRIVATE_SET_FLAG (widget, GTK_IN_REPARENT);
} }
gtk_widget_ref (widget); gtk_widget_ref (widget);
@ -1908,7 +1908,7 @@ gtk_widget_reparent (GtkWidget *widget,
else else
gdk_window_reparent (widget->window, gtk_widget_get_parent_window (widget), 0, 0); gdk_window_reparent (widget->window, gtk_widget_get_parent_window (widget), 0, 0);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_IN_REPARENT); GTK_PRIVATE_UNSET_FLAG (widget, GTK_IN_REPARENT);
} }
} }
} }
@ -2327,7 +2327,7 @@ gtk_widget_set_style (GtkWidget *widget,
{ {
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
GTK_PRIVATE_SET_FLAGS (widget, GTK_USER_STYLE); GTK_PRIVATE_SET_FLAG (widget, GTK_USER_STYLE);
gtk_widget_set_style_internal (widget, style); gtk_widget_set_style_internal (widget, style);
} }
@ -3065,13 +3065,13 @@ gtk_widget_real_destroy (GtkObject *object)
if (GTK_WIDGET_REDRAW_PENDING (widget)) if (GTK_WIDGET_REDRAW_PENDING (widget))
{ {
gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget); gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING); GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
} }
if (GTK_CONTAINER_RESIZE_PENDING (widget)) if (GTK_CONTAINER_RESIZE_PENDING (widget))
{ {
gtk_widget_resize_queue = g_slist_remove (gtk_widget_resize_queue, widget); gtk_widget_resize_queue = g_slist_remove (gtk_widget_resize_queue, widget);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING); GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
} }
if (GTK_WIDGET_RESIZE_NEEDED (widget)) if (GTK_WIDGET_RESIZE_NEEDED (widget))
@ -3081,7 +3081,7 @@ gtk_widget_real_destroy (GtkObject *object)
toplevel = gtk_widget_get_toplevel (widget); toplevel = gtk_widget_get_toplevel (widget);
GTK_CONTAINER (toplevel)->resize_widgets = GTK_CONTAINER (toplevel)->resize_widgets =
g_slist_remove (GTK_CONTAINER (toplevel)->resize_widgets, widget); g_slist_remove (GTK_CONTAINER (toplevel)->resize_widgets, widget);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_NEEDED); GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
} }
if (GTK_WIDGET_HAS_SHAPE_MASK (widget)) if (GTK_WIDGET_HAS_SHAPE_MASK (widget))
@ -3361,7 +3361,7 @@ gtk_widget_real_queue_draw (GtkWidget *widget)
g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING); GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
gtk_widget_draw (widget, NULL); gtk_widget_draw (widget, NULL);
return FALSE; return FALSE;
@ -3381,7 +3381,7 @@ gtk_widget_real_queue_resize (GtkWidget *widget)
g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING); GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
gtk_container_need_resize (GTK_CONTAINER (widget)); gtk_container_need_resize (GTK_CONTAINER (widget));
return FALSE; return FALSE;
@ -3694,7 +3694,7 @@ gtk_widget_shape_combine_mask (GtkWidget *widget,
if (!shape_mask) if (!shape_mask)
{ {
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_HAS_SHAPE_MASK); GTK_PRIVATE_UNSET_FLAG (widget, GTK_HAS_SHAPE_MASK);
shape_info = gtk_object_get_data (GTK_OBJECT (widget), shape_info_key); shape_info = gtk_object_get_data (GTK_OBJECT (widget), shape_info_key);
gtk_object_remove_data (GTK_OBJECT (widget), shape_info_key); gtk_object_remove_data (GTK_OBJECT (widget), shape_info_key);
@ -3708,7 +3708,7 @@ gtk_widget_shape_combine_mask (GtkWidget *widget,
} }
else else
{ {
GTK_PRIVATE_SET_FLAGS (widget, GTK_HAS_SHAPE_MASK); GTK_PRIVATE_SET_FLAG (widget, GTK_HAS_SHAPE_MASK);
shape_info = gtk_object_get_data (GTK_OBJECT (widget), shape_info_key); shape_info = gtk_object_get_data (GTK_OBJECT (widget), shape_info_key);
if (!shape_info) if (!shape_info)

8
gtk/gtkwindow.c
View File

@ -1085,7 +1085,7 @@ gtk_real_window_move_resize (GtkWindow *window,
{ {
child = (GtkWidget *)node->data; child = (GtkWidget *)node->data;
GTK_PRIVATE_UNSET_FLAGS (child, GTK_RESIZE_NEEDED); GTK_PRIVATE_UNSET_FLAG (child, GTK_RESIZE_NEEDED);
widget = child->parent; widget = child->parent;
while (widget && while (widget &&
@ -1094,7 +1094,7 @@ gtk_real_window_move_resize (GtkWindow *window,
widget = widget->parent; widget = widget->parent;
if (widget) if (widget)
GTK_PRIVATE_SET_FLAGS (widget, GTK_RESIZE_NEEDED); GTK_PRIVATE_SET_FLAG (widget, GTK_RESIZE_NEEDED);
} }
for (node = resize_widgets; node; node = node->next) for (node = resize_widgets; node; node = node->next)
@ -1115,7 +1115,7 @@ gtk_real_window_move_resize (GtkWindow *window,
{ {
if (GTK_WIDGET_RESIZE_NEEDED (widget)) if (GTK_WIDGET_RESIZE_NEEDED (widget))
{ {
GTK_PRIVATE_UNSET_FLAGS (resize_container, GTK_RESIZE_NEEDED); GTK_PRIVATE_UNSET_FLAG (resize_container, GTK_RESIZE_NEEDED);
resize_container = widget; resize_container = widget;
} }
widget = widget->parent; widget = widget->parent;
@ -1135,7 +1135,7 @@ gtk_real_window_move_resize (GtkWindow *window,
widget = tmp_list->data; widget = tmp_list->data;
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_NEEDED); GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_NEEDED);
gtk_widget_size_allocate (widget, &widget->allocation); gtk_widget_size_allocate (widget, &widget->allocation);
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);
} }