Switch style of stamp file usage.

[~andy/gtk] / gtk / gtkwidget.c

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 487c80f508d8b4c14a3dad5fa3a977b82446836c..3c7369b529adb0b87fbfec2aa644336c586766a0 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1283,6 +1283,8 @@ gtk_widget_init (GtkWidget *widget)
                        GTK_DOUBLE_BUFFERED);
 
   GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_ON_ALLOC);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED);
+  GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED);
 
   widget->style = gtk_widget_get_default_style ();
   g_object_ref (widget->style);
@@ -1706,7 +1708,7 @@ gtk_widget_hide (GtkWidget *widget)
     {
       gtk_widget_ref (widget);
       gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
-      if (!GTK_WIDGET_TOPLEVEL (widget) && GTK_WIDGET_REALIZED (widget))
+      if (!GTK_WIDGET_TOPLEVEL (widget))
        gtk_widget_queue_resize (widget);
       g_object_notify (G_OBJECT (widget), "visible");
       gtk_widget_unref (widget);
@@ -2866,35 +2868,20 @@ static gboolean
 gtk_widget_real_key_press_event (GtkWidget         *widget,
                                 GdkEventKey       *event)
 {
-  gboolean handled = FALSE;
-
-  if (!handled)
-    handled = gtk_bindings_activate (GTK_OBJECT (widget),
-                                    event->keyval,
-                                    event->state);
-
-  return handled;
+  return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
 }
 
 static gboolean
 gtk_widget_real_key_release_event (GtkWidget         *widget,
                                   GdkEventKey       *event)
 {
-  gboolean handled = FALSE;
-
-  if (!handled)
-    handled = gtk_bindings_activate (GTK_OBJECT (widget),
-                                    event->keyval,
-                                    event->state | GDK_RELEASE_MASK);
-
-  return handled;
+  return _gtk_bindings_activate_event (GTK_OBJECT (widget), event);
 }
 
 static gboolean
 gtk_widget_real_focus_in_event (GtkWidget     *widget,
                                 GdkEventFocus *event)
 {
-  GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
   gtk_widget_queue_draw (widget);
 
   return FALSE;
@@ -2904,12 +2891,14 @@ static gboolean
 gtk_widget_real_focus_out_event (GtkWidget     *widget,
                                  GdkEventFocus *event)
 {
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
   gtk_widget_queue_draw (widget);
 
   return FALSE;
 }
 
+#define WIDGET_REALIZED_FOR_EVENT(widget, event) \
+     (event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget))
+
 /**
  * gtk_widget_event:
  * @widget: a #GtkWidget
@@ -2931,7 +2920,7 @@ gtk_widget_event (GtkWidget *widget,
                  GdkEvent  *event)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
-  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
+  g_return_val_if_fail (WIDGET_REALIZED_FOR_EVENT (widget, event), TRUE);
 
   if (event->type == GDK_EXPOSE)
     {
@@ -2987,7 +2976,7 @@ gtk_widget_event_internal (GtkWidget *widget,
   gtk_widget_ref (widget);
 
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT], event, &return_val);
-  return_val |= !GTK_WIDGET_REALIZED (widget);
+  return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event);
   if (!return_val)
     {
       gint signal_num;
@@ -3082,7 +3071,7 @@ gtk_widget_event_internal (GtkWidget *widget,
       if (signal_num != -1)
        gtk_signal_emit (GTK_OBJECT (widget), widget_signals[signal_num], event, &return_val);
     }
-  if (GTK_WIDGET_REALIZED (widget))
+  if (WIDGET_REALIZED_FOR_EVENT (widget, event))
     gtk_signal_emit (GTK_OBJECT (widget), widget_signals[EVENT_AFTER], event);
   else
     return_val = TRUE;
@@ -3228,6 +3217,8 @@ gtk_widget_reparent (GtkWidget *widget,
          gtk_widget_reparent_container_child (widget,
                                               gtk_widget_get_parent_window (widget));
        }
+
+      g_object_notify (G_OBJECT (widget), "parent");
     }
 }
 
@@ -3320,6 +3311,9 @@ gtk_widget_grab_focus (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
+  if (!GTK_WIDGET_IS_SENSITIVE (widget))
+    return;
+  
   g_object_ref (G_OBJECT (widget));
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
   g_object_notify (G_OBJECT (widget), "has_focus");
@@ -6377,6 +6371,19 @@ gtk_requisition_free (GtkRequisition *requisition)
   g_free (requisition);
 }
 
+GType
+gtk_requisition_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GtkTypeRequisition",
+                                            (GBoxedCopyFunc) gtk_requisition_copy,
+                                            (GBoxedFreeFunc) gtk_requisition_free);
+
+  return our_type;
+}
+
 AtkObject* 
 gtk_widget_get_accessible (GtkWidget *widget)
 {
@@ -6436,4 +6443,3 @@ gtk_widget_ref_accessible (AtkImplementor *implementor)
     g_object_ref (G_OBJECT (accessible));
   return accessible;
 }
-