]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkeventbox.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gtk / gtkeventbox.c
index e29e0c2ad936c5ec787f9180397861e7e41451ff..98025be07e55487ad2672e426f630a543d49eb89 100644 (file)
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #include "config.h"
+
 #include "gtkeventbox.h"
+
+#include "gtksizerequest.h"
+
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 
-typedef struct 
+
+/**
+ * SECTION:gtkeventbox
+ * @Short_description: A widget used to catch events for widgets which
+ *     do not have their own window
+ * @Title: GtkEventBox
+ *
+ * The #GtkEventBox widget is a subclass of #GtkBin which also has its
+ * own window. It is useful since it allows you to catch events for widgets
+ * which do not have their own window.
+ */
+
+struct _GtkEventBoxPrivate
 {
   gboolean above_child;
   GdkWindow *event_window;
-} GtkEventBoxPrivate;
+};
 
 enum {
   PROP_0,
@@ -42,29 +55,28 @@ enum {
   PROP_ABOVE_CHILD
 };
 
-
-#define GTK_EVENT_BOX_GET_PRIVATE(obj)  G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_TYPE_EVENT_BOX, GtkEventBoxPrivate)
-
-static void gtk_event_box_realize       (GtkWidget        *widget);
-static void gtk_event_box_unrealize     (GtkWidget        *widget);
-static void gtk_event_box_map           (GtkWidget        *widget);
-static void gtk_event_box_unmap         (GtkWidget        *widget);
-static void gtk_event_box_size_request  (GtkWidget        *widget,
-                                        GtkRequisition   *requisition);
-static void gtk_event_box_size_allocate (GtkWidget        *widget,
-                                        GtkAllocation    *allocation);
-static void gtk_event_box_paint         (GtkWidget        *widget,
-                                        GdkRectangle     *area);
-static gint gtk_event_box_expose        (GtkWidget        *widget,
-                                        GdkEventExpose   *event);
-static void gtk_event_box_set_property  (GObject          *object,
-                                        guint             prop_id,
-                                        const GValue     *value,
-                                        GParamSpec       *pspec);
-static void gtk_event_box_get_property  (GObject          *object,
-                                        guint             prop_id,
-                                        GValue           *value,
-                                        GParamSpec       *pspec);
+static void     gtk_event_box_realize       (GtkWidget        *widget);
+static void     gtk_event_box_unrealize     (GtkWidget        *widget);
+static void     gtk_event_box_map           (GtkWidget        *widget);
+static void     gtk_event_box_unmap         (GtkWidget        *widget);
+static void     gtk_event_box_get_preferred_width  (GtkWidget *widget,
+                                                    gint      *minimum,
+                                                    gint      *natural);
+static void     gtk_event_box_get_preferred_height (GtkWidget *widget,
+                                                    gint      *minimum,
+                                                    gint      *natural);
+static void     gtk_event_box_size_allocate (GtkWidget        *widget,
+                                             GtkAllocation    *allocation);
+static gboolean gtk_event_box_draw          (GtkWidget        *widget,
+                                             cairo_t          *cr);
+static void     gtk_event_box_set_property  (GObject          *object,
+                                             guint             prop_id,
+                                             const GValue     *value,
+                                             GParamSpec       *pspec);
+static void     gtk_event_box_get_property  (GObject          *object,
+                                             guint             prop_id,
+                                             GValue           *value,
+                                             GParamSpec       *pspec);
 
 G_DEFINE_TYPE (GtkEventBox, gtk_event_box, GTK_TYPE_BIN)
 
@@ -73,17 +85,21 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
 
   gobject_class->set_property = gtk_event_box_set_property;
   gobject_class->get_property = gtk_event_box_get_property;
-  
+
   widget_class->realize = gtk_event_box_realize;
   widget_class->unrealize = gtk_event_box_unrealize;
   widget_class->map = gtk_event_box_map;
   widget_class->unmap = gtk_event_box_unmap;
-  widget_class->size_request = gtk_event_box_size_request;
+  widget_class->get_preferred_width = gtk_event_box_get_preferred_width;
+  widget_class->get_preferred_height = gtk_event_box_get_preferred_height;
   widget_class->size_allocate = gtk_event_box_size_allocate;
-  widget_class->expose_event = gtk_event_box_expose;
+  widget_class->draw = gtk_event_box_draw;
+
+  gtk_container_class_handle_border_width (container_class);
 
   g_object_class_install_property (gobject_class,
                                    PROP_VISIBLE_WINDOW,
@@ -99,7 +115,7 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
                                                         P_("Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it."),
                                                         FALSE,
                                                         GTK_PARAM_READWRITE));
-  
+
   g_type_class_add_private (class, sizeof (GtkEventBoxPrivate));
 }
 
@@ -108,60 +124,75 @@ gtk_event_box_init (GtkEventBox *event_box)
 {
   GtkEventBoxPrivate *priv;
 
-  GTK_WIDGET_UNSET_FLAGS (event_box, GTK_NO_WINDOW);
-  priv = GTK_EVENT_BOX_GET_PRIVATE (event_box);
+  gtk_widget_set_has_window (GTK_WIDGET (event_box), TRUE);
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (event_box,
+                                      GTK_TYPE_EVENT_BOX,
+                                      GtkEventBoxPrivate);
+
+  event_box->priv = priv;
   priv->above_child = FALSE;
 }
 
+/**
+ * gtk_event_box_new:
+ *
+ * Creates a new #GtkEventBox.
+ *
+ * Returns: a new #GtkEventBox
+ */
 GtkWidget*
 gtk_event_box_new (void)
 {
   return g_object_new (GTK_TYPE_EVENT_BOX, NULL);
 }
 
-static void 
+static void
 gtk_event_box_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
+                            guint         prop_id,
+                            const GValue *value,
+                            GParamSpec   *pspec)
 {
   GtkEventBox *event_box;
-  
+
   event_box = GTK_EVENT_BOX (object);
-  
+
   switch (prop_id)
     {
     case PROP_VISIBLE_WINDOW:
       gtk_event_box_set_visible_window (event_box, g_value_get_boolean (value));
-      break;     
+      break;
+
     case PROP_ABOVE_CHILD:
       gtk_event_box_set_above_child (event_box, g_value_get_boolean (value));
-      break;     
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
-static void 
+static void
 gtk_event_box_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
+                            guint        prop_id,
+                            GValue      *value,
+                            GParamSpec  *pspec)
 {
   GtkEventBox *event_box;
-  
+
   event_box = GTK_EVENT_BOX (object);
-  
+
   switch (prop_id)
     {
     case PROP_VISIBLE_WINDOW:
       g_value_set_boolean (value, gtk_event_box_get_visible_window (event_box));
       break;
+
     case PROP_ABOVE_CHILD:
       g_value_set_boolean (value, gtk_event_box_get_above_child (event_box));
       break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -178,37 +209,37 @@ gtk_event_box_get_property (GObject     *object,
  * Return value: %TRUE if the event box window is visible
  *
  * Since: 2.4
- **/
+ */
 gboolean
 gtk_event_box_get_visible_window (GtkEventBox *event_box)
 {
   g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), FALSE);
 
-  return !GTK_WIDGET_NO_WINDOW (event_box);
+  return gtk_widget_get_has_window (GTK_WIDGET (event_box));
 }
 
 /**
  * gtk_event_box_set_visible_window:
  * @event_box: a #GtkEventBox
- * @visible_window: boolean value
+ * @visible_window: %TRUE to make the event box have a visible window
  *
  * Set whether the event box uses a visible or invisible child
  * window. The default is to use visible windows.
  *
  * In an invisible window event box, the window that the
- * event box creates is a %GDK_INPUT_ONLY window, which 
+ * event box creates is a %GDK_INPUT_ONLY window, which
  * means that it is invisible and only serves to receive
  * events.
- * 
+ *
  * A visible window event box creates a visible (%GDK_INPUT_OUTPUT)
- * window that acts as the parent window for all the widgets  
+ * window that acts as the parent window for all the widgets
  * contained in the event box.
- * 
+ *
  * You should generally make your event box invisible if
  * you just want to trap events. Creating a visible window
  * may cause artifacts that are visible to the user, especially
  * if the user is using a theme with gradients or pixmaps.
- * 
+ *
  * The main reason to create a non input-only event box is if
  * you want to set the background to a different color or
  * draw on it.
@@ -217,22 +248,22 @@ gtk_event_box_get_visible_window (GtkEventBox *event_box)
  * There is one unexpected issue for an invisible event box that has its
  * window below the child. (See gtk_event_box_set_above_child().)
  * Since the input-only window is not an ancestor window of any windows
- * that descendent widgets of the event box create, events on these 
+ * that descendent widgets of the event box create, events on these
  * windows aren't propagated up by the windowing system, but only by GTK+.
  * The practical effect of this is if an event isn't in the event
- * mask for the descendant window (see gtk_widget_add_events()),  
- * it won't be received by the event box. 
+ * mask for the descendant window (see gtk_widget_add_events()),
+ * it won't be received by the event box.
  * </para><para>
  * This problem doesn't occur for visible event boxes, because in
  * that case, the event box window is actually the ancestor of the
  * descendant windows, not just at the same place on the screen.
  * </para></note>
- * 
+ *
  * Since: 2.4
- **/
+ */
 void
 gtk_event_box_set_visible_window (GtkEventBox *event_box,
-                                 gboolean visible_window)
+                                  gboolean     visible_window)
 {
   GtkWidget *widget;
 
@@ -242,38 +273,32 @@ gtk_event_box_set_visible_window (GtkEventBox *event_box,
 
   visible_window = visible_window != FALSE;
 
-  if (visible_window != !GTK_WIDGET_NO_WINDOW (widget))
+  if (visible_window != gtk_widget_get_has_window (widget))
     {
-      if (GTK_WIDGET_REALIZED (widget))
-       {
-         gboolean visible = GTK_WIDGET_VISIBLE (widget);
+      if (gtk_widget_get_realized (widget))
+        {
+          gboolean visible = gtk_widget_get_visible (widget);
 
-         if (visible)
-           gtk_widget_hide (widget);
+          if (visible)
+            gtk_widget_hide (widget);
 
-         gtk_widget_unrealize (widget);
+          gtk_widget_unrealize (widget);
 
-         if (visible_window)
-           GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_WINDOW);
-         else
-           GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);
-         
-         gtk_widget_realize (widget);
+          gtk_widget_set_has_window (widget, visible_window);
 
-         if (visible)
-           gtk_widget_show (widget);
-       }
+          gtk_widget_realize (widget);
+
+          if (visible)
+            gtk_widget_show (widget);
+        }
       else
-       {
-         if (visible_window)
-           GTK_WIDGET_UNSET_FLAGS (widget, GTK_NO_WINDOW);
-         else
-           GTK_WIDGET_SET_FLAGS (widget, GTK_NO_WINDOW);
-       }
-
-      if (GTK_WIDGET_VISIBLE (widget))
-       gtk_widget_queue_resize (widget);
-      
+        {
+          gtk_widget_set_has_window (widget, visible_window);
+        }
+
+      if (gtk_widget_get_visible (widget))
+        gtk_widget_queue_resize (widget);
+
       g_object_notify (G_OBJECT (event_box), "visible-window");
     }
 }
@@ -283,52 +308,49 @@ gtk_event_box_set_visible_window (GtkEventBox *event_box,
  * @event_box: a #GtkEventBox
  *
  * Returns whether the event box window is above or below the
- * windows of its child. See gtk_event_box_set_above_child() for
- * details.
+ * windows of its child. See gtk_event_box_set_above_child()
+ * for details.
  *
- * Return value: %TRUE if the event box window is above the window
- * of its child.
+ * Return value: %TRUE if the event box window is above the
+ *     window of its child
  *
  * Since: 2.4
- **/
+ */
 gboolean
 gtk_event_box_get_above_child (GtkEventBox *event_box)
 {
-  GtkEventBoxPrivate *priv;
+  GtkEventBoxPrivate *priv = event_box->priv;
 
   g_return_val_if_fail (GTK_IS_EVENT_BOX (event_box), FALSE);
 
-  priv = GTK_EVENT_BOX_GET_PRIVATE (event_box);
-
   return priv->above_child;
 }
 
 /**
  * gtk_event_box_set_above_child:
  * @event_box: a #GtkEventBox
- * @above_child: %TRUE if the event box window is above the windows of its child
+ * @above_child: %TRUE if the event box window is above its child
  *
- * Set whether the event box window is positioned above the windows of its child,
- * as opposed to below it. If the window is above, all events inside the
- * event box will go to the event box. If the window is below, events
- * in windows of child widgets will first got to that widget, and then
- * to its parents.
+ * Set whether the event box window is positioned above the windows
+ * of its child, as opposed to below it. If the window is above, all
+ * events inside the event box will go to the event box. If the window
+ * is below, events in windows of child widgets will first got to that
+ * widget, and then to its parents.
  *
  * The default is to keep the window below the child.
- * 
+ *
  * Since: 2.4
- **/
+ */
 void
 gtk_event_box_set_above_child (GtkEventBox *event_box,
-                              gboolean above_child)
+                               gboolean     above_child)
 {
+  GtkEventBoxPrivate *priv = event_box->priv;
   GtkWidget *widget;
-  GtkEventBoxPrivate *priv;
 
   g_return_if_fail (GTK_IS_EVENT_BOX (event_box));
 
   widget = GTK_WIDGET (event_box);
-  priv = GTK_EVENT_BOX_GET_PRIVATE (event_box);
 
   above_child = above_child != FALSE;
 
@@ -336,84 +358,84 @@ gtk_event_box_set_above_child (GtkEventBox *event_box,
     {
       priv->above_child = above_child;
 
-      if (GTK_WIDGET_REALIZED (widget))
-       {
-         if (GTK_WIDGET_NO_WINDOW (widget))
-           {
-             if (above_child)
-               gdk_window_raise (priv->event_window);
-             else
-               gdk_window_lower (priv->event_window);
-           }
-         else
-           {
-             gboolean visible = GTK_WIDGET_VISIBLE (widget);
-
-             if (visible)
-               gtk_widget_hide (widget);
-             
-             gtk_widget_unrealize (widget);
-             
-             gtk_widget_realize (widget);
-             
-             if (visible)
-               gtk_widget_show (widget);
-           }
-       }
-
-      if (GTK_WIDGET_VISIBLE (widget))
-       gtk_widget_queue_resize (widget);
-      
+      if (gtk_widget_get_realized (widget))
+        {
+          if (!gtk_widget_get_has_window (widget))
+            {
+              if (above_child)
+                gdk_window_raise (priv->event_window);
+              else
+                gdk_window_lower (priv->event_window);
+            }
+          else
+            {
+              gboolean visible = gtk_widget_get_visible (widget);
+
+              if (visible)
+                gtk_widget_hide (widget);
+
+              gtk_widget_unrealize (widget);
+              gtk_widget_realize (widget);
+
+              if (visible)
+                gtk_widget_show (widget);
+            }
+        }
+
+      if (gtk_widget_get_visible (widget))
+        gtk_widget_queue_resize (widget);
+
       g_object_notify (G_OBJECT (event_box), "above-child");
     }
 }
 
-
 static void
 gtk_event_box_realize (GtkWidget *widget)
 {
+  GtkEventBoxPrivate *priv;
+  GtkAllocation allocation;
+  GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  gint border_width;
-  GtkEventBoxPrivate *priv;
   gboolean visible_window;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gtk_widget_set_realized (widget, TRUE);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
-  
-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2*border_width;
-  attributes.height = widget->allocation.height - 2*border_width;
+  attributes.x = allocation.x;
+  attributes.y = allocation.y;
+  attributes.width = allocation.width;
+  attributes.height = allocation.height;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget)
-                       | GDK_BUTTON_MOTION_MASK
-                       | GDK_BUTTON_PRESS_MASK
-                       | GDK_BUTTON_RELEASE_MASK
-                       | GDK_EXPOSURE_MASK
-                       | GDK_ENTER_NOTIFY_MASK
-                       | GDK_LEAVE_NOTIFY_MASK;
+                        | GDK_BUTTON_MOTION_MASK
+                        | GDK_BUTTON_PRESS_MASK
+                        | GDK_BUTTON_RELEASE_MASK
+                        | GDK_EXPOSURE_MASK
+                        | GDK_ENTER_NOTIFY_MASK
+                        | GDK_LEAVE_NOTIFY_MASK;
 
-  priv = GTK_EVENT_BOX_GET_PRIVATE (widget);
+  priv = GTK_EVENT_BOX (widget)->priv;
 
-  visible_window = !GTK_WIDGET_NO_WINDOW (widget);
+  visible_window = gtk_widget_get_has_window (widget);
   if (visible_window)
     {
       attributes.visual = gtk_widget_get_visual (widget);
-      attributes.colormap = gtk_widget_get_colormap (widget);
       attributes.wclass = GDK_INPUT_OUTPUT;
-      
-      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-      
-      widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                      &attributes, attributes_mask);
-      gdk_window_set_user_data (widget->window, widget);
+
+      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+
+      window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                               &attributes, attributes_mask);
+      gtk_widget_set_window (widget, window);
+      gtk_widget_register_window (widget, window);
     }
   else
     {
-      widget->window = gtk_widget_get_parent_window (widget);
-      g_object_ref (widget->window);
+      window = gtk_widget_get_parent_window (widget);
+      gtk_widget_set_window (widget, window);
+      g_object_ref (window);
     }
 
   if (!visible_window || priv->above_child)
@@ -424,28 +446,23 @@ gtk_event_box_realize (GtkWidget *widget)
       else
         attributes_mask = 0;
 
-      priv->event_window = gdk_window_new (widget->window,
-                                          &attributes, attributes_mask);
-      gdk_window_set_user_data (priv->event_window, widget);
+      priv->event_window = gdk_window_new (window,
+                                           &attributes, attributes_mask);
+      gtk_widget_register_window (widget, priv->event_window);
     }
 
-
-  widget->style = gtk_style_attach (widget->style, widget->window);
-  
   if (visible_window)
-    gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+    gtk_style_context_set_background (gtk_widget_get_style_context (widget), window);
 }
 
 static void
 gtk_event_box_unrealize (GtkWidget *widget)
 {
-  GtkEventBoxPrivate *priv;
-  
-  priv = GTK_EVENT_BOX_GET_PRIVATE (widget);
-  
+  GtkEventBoxPrivate *priv = GTK_EVENT_BOX (widget)->priv;
+
   if (priv->event_window != NULL)
     {
-      gdk_window_set_user_data (priv->event_window, NULL);
+      gtk_widget_unregister_window (widget, priv->event_window);
       gdk_window_destroy (priv->event_window);
       priv->event_window = NULL;
     }
@@ -456,9 +473,7 @@ gtk_event_box_unrealize (GtkWidget *widget)
 static void
 gtk_event_box_map (GtkWidget *widget)
 {
-  GtkEventBoxPrivate *priv;
-
-  priv = GTK_EVENT_BOX_GET_PRIVATE (widget);
+  GtkEventBoxPrivate *priv = GTK_EVENT_BOX (widget)->priv;
 
   if (priv->event_window != NULL && !priv->above_child)
     gdk_window_show (priv->event_window);
@@ -472,9 +487,7 @@ gtk_event_box_map (GtkWidget *widget)
 static void
 gtk_event_box_unmap (GtkWidget *widget)
 {
-  GtkEventBoxPrivate *priv;
-
-  priv = GTK_EVENT_BOX_GET_PRIVATE (widget);
+  GtkEventBoxPrivate *priv = GTK_EVENT_BOX (widget)->priv;
 
   if (priv->event_window != NULL)
     gdk_window_hide (priv->event_window);
@@ -482,100 +495,111 @@ gtk_event_box_unmap (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unmap (widget);
 }
 
+static void
+gtk_event_box_get_preferred_width (GtkWidget *widget,
+                                   gint      *minimum,
+                                   gint      *natural)
+{
+  GtkBin *bin = GTK_BIN (widget);
+  GtkWidget *child;
+
+  if (minimum)
+    *minimum = 0;
+
+  if (natural)
+    *natural = 0;
 
+  child = gtk_bin_get_child (bin);
+  if (child && gtk_widget_get_visible (child))
+    gtk_widget_get_preferred_width (child, minimum, natural);
+}
 
 static void
-gtk_event_box_size_request (GtkWidget      *widget,
-                           GtkRequisition *requisition)
+gtk_event_box_get_preferred_height (GtkWidget *widget,
+                                    gint      *minimum,
+                                    gint      *natural)
 {
   GtkBin *bin = GTK_BIN (widget);
+  GtkWidget *child;
 
-  requisition->width = GTK_CONTAINER (widget)->border_width * 2;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2;
+  if (minimum)
+    *minimum = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-    {
-      GtkRequisition child_requisition;
-      
-      gtk_widget_size_request (bin->child, &child_requisition);
+  if (natural)
+    *natural = 0;
 
-      requisition->width += child_requisition.width;
-      requisition->height += child_requisition.height;
-    }
+  child = gtk_bin_get_child (bin);
+  if (child && gtk_widget_get_visible (child))
+    gtk_widget_get_preferred_height (child, minimum, natural);
 }
 
 static void
 gtk_event_box_size_allocate (GtkWidget     *widget,
-                            GtkAllocation *allocation)
+                             GtkAllocation *allocation)
 {
   GtkBin *bin;
   GtkAllocation child_allocation;
   GtkEventBoxPrivate *priv;
-  
-  widget->allocation = *allocation;
+  GtkWidget *child;
+
   bin = GTK_BIN (widget);
-  
-  if (GTK_WIDGET_NO_WINDOW (widget))
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (!gtk_widget_get_has_window (widget))
     {
-      child_allocation.x = allocation->x + GTK_CONTAINER (widget)->border_width;
-      child_allocation.y = allocation->y + GTK_CONTAINER (widget)->border_width;
+      child_allocation.x = allocation->x;
+      child_allocation.y = allocation->y;
     }
   else
     {
       child_allocation.x = 0;
       child_allocation.y = 0;
     }
-  child_allocation.width = MAX (allocation->width - GTK_CONTAINER (widget)->border_width * 2, 0);
-  child_allocation.height = MAX (allocation->height - GTK_CONTAINER (widget)->border_width * 2, 0);
+  child_allocation.width = allocation->width;
+  child_allocation.height = allocation->height;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     {
-      priv = GTK_EVENT_BOX_GET_PRIVATE (widget);
+      priv = GTK_EVENT_BOX (widget)->priv;
 
       if (priv->event_window != NULL)
-       gdk_window_move_resize (priv->event_window,
-                               child_allocation.x,
-                               child_allocation.y,
-                               child_allocation.width,
-                               child_allocation.height);
-      
-      if (!GTK_WIDGET_NO_WINDOW (widget))
-       gdk_window_move_resize (widget->window,
-                               allocation->x + GTK_CONTAINER (widget)->border_width,
-                               allocation->y + GTK_CONTAINER (widget)->border_width,
-                               child_allocation.width,
-                               child_allocation.height);
+        gdk_window_move_resize (priv->event_window,
+                                child_allocation.x,
+                                child_allocation.y,
+                                child_allocation.width,
+                                child_allocation.height);
+
+      if (gtk_widget_get_has_window (widget))
+        gdk_window_move_resize (gtk_widget_get_window (widget),
+                                allocation->x,
+                                allocation->y,
+                                child_allocation.width,
+                                child_allocation.height);
     }
-  
-  if (bin->child)
-    gtk_widget_size_allocate (bin->child, &child_allocation);
-}
 
-static void
-gtk_event_box_paint (GtkWidget    *widget,
-                    GdkRectangle *area)
-{
-  if (!GTK_WIDGET_APP_PAINTABLE (widget))
-    gtk_paint_flat_box (widget->style, widget->window,
-                       widget->state, GTK_SHADOW_NONE,
-                       area, widget, "eventbox",
-                       0, 0, -1, -1);
+  child = gtk_bin_get_child (bin);
+  if (child)
+    gtk_widget_size_allocate (child, &child_allocation);
 }
 
-static gint
-gtk_event_box_expose (GtkWidget      *widget,
-                    GdkEventExpose *event)
+static gboolean
+gtk_event_box_draw (GtkWidget *widget,
+                    cairo_t   *cr)
 {
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_get_has_window (widget) &&
+      !gtk_widget_get_app_paintable (widget))
     {
-      if (!GTK_WIDGET_NO_WINDOW (widget))
-       gtk_event_box_paint (widget, &event->area);
+      GtkStyleContext *context;
+
+      context = gtk_widget_get_style_context (widget);
 
-      GTK_WIDGET_CLASS (gtk_event_box_parent_class)->expose_event (widget, event);
+      gtk_render_background (context, cr, 0, 0,
+                             gtk_widget_get_allocated_width (widget),
+                             gtk_widget_get_allocated_height (widget));
     }
 
+  GTK_WIDGET_CLASS (gtk_event_box_parent_class)->draw (widget, cr);
+
   return FALSE;
 }
-
-#define __GTK_EVENT_BOX_C__
-#include "gtkaliasdef.c"