]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkpaned.c
Test for window == NULL in a number of cases.
[~andy/gtk] / gtk / gtkpaned.c
index d6b53db3d45a11f9aef7c1dd9752b7efebfa0f18..17f02860b619849b7bf37caff556a0f3f63a403c 100644 (file)
@@ -2,63 +2,84 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
  */
-#include "gtkpaned.h"
 
+/*
+ * 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/. 
+ */
 
-static void gtk_paned_class_init (GtkPanedClass    *klass);
-static void gtk_paned_init       (GtkPaned         *paned);
-static void gtk_paned_destroy    (GtkObject      *object);
-static void gtk_paned_realize    (GtkWidget *widget);
-static void gtk_paned_map        (GtkWidget      *widget);
-static void gtk_paned_unmap      (GtkWidget      *widget);
-static void gtk_paned_unrealize  (GtkWidget *widget);
-static gint gtk_paned_expose     (GtkWidget      *widget,
-                               GdkEventExpose *event);
-static void gtk_paned_add        (GtkContainer   *container,
-                               GtkWidget      *widget);
-static void gtk_paned_remove     (GtkContainer   *container,
-                               GtkWidget      *widget);
-static void gtk_paned_foreach    (GtkContainer   *container,
-                               GtkCallback     callback,
-                               gpointer        callback_data);
+#include "gtkintl.h"
+#include "gtkpaned.h"
 
+enum {
+  ARG_0,
+};
+
+static void    gtk_paned_class_init (GtkPanedClass  *klass);
+static void    gtk_paned_init       (GtkPaned       *paned);
+static void    gtk_paned_set_arg    (GtkObject      *object,
+                                    GtkArg         *arg,
+                                    guint           arg_id);
+static void    gtk_paned_get_arg    (GtkObject      *object,
+                                    GtkArg         *arg,
+                                    guint           arg_id);
+static void    gtk_paned_realize    (GtkWidget      *widget);
+static void    gtk_paned_map        (GtkWidget      *widget);
+static void    gtk_paned_unmap      (GtkWidget      *widget);
+static void    gtk_paned_unrealize  (GtkWidget      *widget);
+static gint    gtk_paned_expose     (GtkWidget      *widget,
+                                    GdkEventExpose *event);
+static void    gtk_paned_add        (GtkContainer   *container,
+                                    GtkWidget      *widget);
+static void    gtk_paned_remove     (GtkContainer   *container,
+                                    GtkWidget      *widget);
+static void    gtk_paned_forall     (GtkContainer   *container,
+                                    gboolean        include_internals,
+                                    GtkCallback     callback,
+                                    gpointer        callback_data);
+static GtkType gtk_paned_child_type (GtkContainer   *container);
 
 static GtkContainerClass *parent_class = NULL;
 
 
-guint
-gtk_paned_get_type ()
+GtkType
+gtk_paned_get_type (void)
 {
-  static guint paned_type = 0;
-
+  static GtkType paned_type = 0;
+  
   if (!paned_type)
     {
-      GtkTypeInfo paned_info =
+      static const GtkTypeInfo paned_info =
       {
        "GtkPaned",
        sizeof (GtkPaned),
        sizeof (GtkPanedClass),
        (GtkClassInitFunc) gtk_paned_class_init,
        (GtkObjectInitFunc) gtk_paned_init,
-       (GtkArgFunc) NULL,
+       /* reserved_1 */ NULL,
+       /* reserved_2 */ NULL,
+       (GtkClassInitFunc) NULL,
       };
 
-      paned_type = gtk_type_unique (gtk_container_get_type (), &paned_info);
+      paned_type = gtk_type_unique (GTK_TYPE_CONTAINER, &paned_info);
     }
-
+  
   return paned_type;
 }
 
@@ -69,70 +90,89 @@ gtk_paned_class_init (GtkPanedClass *class)
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
 
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
-  container_class = (GtkContainerClass*) class;
+  object_class = (GtkObjectClass *) class;
+  widget_class = (GtkWidgetClass *) class;
+  container_class = (GtkContainerClass *) class;
 
-  parent_class = gtk_type_class (gtk_container_get_type ());
+  parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
 
-  object_class->destroy = gtk_paned_destroy;
+  object_class->set_arg = gtk_paned_set_arg;
+  object_class->get_arg = gtk_paned_get_arg;
 
   widget_class->realize = gtk_paned_realize;
   widget_class->map = gtk_paned_map;
   widget_class->unmap = gtk_paned_unmap;
   widget_class->unrealize = gtk_paned_unrealize;
   widget_class->expose_event = gtk_paned_expose;
-
+  
   container_class->add = gtk_paned_add;
   container_class->remove = gtk_paned_remove;
-  container_class->foreach = gtk_paned_foreach;
+  container_class->forall = gtk_paned_forall;
+  container_class->child_type = gtk_paned_child_type;
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("handle_size",
+                                                            _("Handle Size"),
+                                                            _("Width of handle"),
+                                                            0,
+                                                            G_MAXINT,
+                                                            5,
+                                                            G_PARAM_READABLE));
+}
+
+static GtkType
+gtk_paned_child_type (GtkContainer *container)
+{
+  if (!GTK_PANED (container)->child1 || !GTK_PANED (container)->child2)
+    return GTK_TYPE_WIDGET;
+  else
+    return GTK_TYPE_NONE;
 }
 
 static void
 gtk_paned_init (GtkPaned *paned)
 {
-  GTK_WIDGET_SET_FLAGS (paned, GTK_NO_WINDOW);
-
+  GTK_WIDGET_UNSET_FLAGS (paned, GTK_NO_WINDOW);
+  
   paned->child1 = NULL;
   paned->child2 = NULL;
   paned->handle = NULL;
   paned->xor_gc = NULL;
-
-  paned->handle_size = 10;
-  paned->gutter_size = 6;
+  paned->cursor_type = GDK_CROSS;
+  
+  paned->handle_width = 5;
+  paned->handle_height = 5;
   paned->position_set = FALSE;
+  paned->last_allocation = -1;
   paned->in_drag = FALSE;
-
+  
   paned->handle_xpos = -1;
   paned->handle_ypos = -1;
 }
 
-
 static void
-gtk_paned_destroy (GtkObject *object)
+gtk_paned_set_arg (GtkObject *object,
+                  GtkArg    *arg,
+                  guint      arg_id)
 {
-  GtkPaned *paned;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GTK_IS_PANED (object));
-
-  paned = GTK_PANED (object);
-
-  if (paned->child1)
+  switch (arg_id)
     {
-      paned->child1->parent = NULL;
-      gtk_object_unref (GTK_OBJECT (paned->child1));
-      gtk_widget_destroy (paned->child1);
+    default:
+      break;
     }
-  if (paned->child2)
+}
+
+static void
+gtk_paned_get_arg (GtkObject *object,
+                  GtkArg    *arg,
+                  guint      arg_id)
+{
+  switch (arg_id)
     {
-      paned->child2->parent = NULL;
-      gtk_object_unref (GTK_OBJECT (paned->child2));
-      gtk_widget_destroy (paned->child2);
+    default:
+      arg->type = GTK_TYPE_INVALID;
+      break;
     }
-
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
 static void
@@ -148,34 +188,45 @@ gtk_paned_realize (GtkWidget *widget)
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
   paned = GTK_PANED (widget);
 
-  attributes.x = paned->handle_xpos;
-  attributes.y = paned->handle_ypos;
-  attributes.width = paned->handle_size;
-  attributes.height = paned->handle_size;
-  attributes.wclass = GDK_INPUT_OUTPUT;
+  attributes.x = widget->allocation.x;
+  attributes.y = widget->allocation.y;
+  attributes.width = widget->allocation.width;
+  attributes.height = widget->allocation.height;
   attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.cursor = gdk_cursor_new(GDK_CROSS);
-  attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= (GDK_EXPOSURE_MASK |
-                           GDK_BUTTON_PRESS_MASK |
+  attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
+  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, paned);
+
+  attributes.x = paned->handle_xpos;
+  attributes.y = paned->handle_ypos;
+  attributes.width = paned->handle_width;
+  attributes.height = paned->handle_height;
+  attributes.cursor = gdk_cursor_new (paned->cursor_type);
+  attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
                            GDK_BUTTON_RELEASE_MASK |
                            GDK_POINTER_MOTION_MASK |
                            GDK_POINTER_MOTION_HINT_MASK);
+  attributes_mask |= GDK_WA_CURSOR;
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP |
-    GDK_WA_CURSOR;
-
-  paned->handle = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
-  gdk_window_set_user_data (paned->handle, widget);
-  gdk_window_show (paned->handle);
-  gdk_window_raise (paned->handle);
+  paned->handle = gdk_window_new (widget->window,
+                                 &attributes, attributes_mask);
+  gdk_window_set_user_data (paned->handle, paned);
+  gdk_cursor_destroy (attributes.cursor);
 
-  widget->window = widget->parent->window;
   widget->style = gtk_style_attach (widget->style, widget->window);
 
+  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
   gtk_style_set_background (widget->style, paned->handle, GTK_STATE_NORMAL);
+
+  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+
+  gdk_window_show (paned->handle);
 }
 
 static void
@@ -189,9 +240,6 @@ gtk_paned_map (GtkWidget *widget)
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
   paned = GTK_PANED (widget);
 
-  gdk_window_show (paned->handle);
-  gtk_widget_queue_draw (widget);
-
   if (paned->child1 &&
       GTK_WIDGET_VISIBLE (paned->child1) &&
       !GTK_WIDGET_MAPPED (paned->child1))
@@ -200,34 +248,19 @@ gtk_paned_map (GtkWidget *widget)
       GTK_WIDGET_VISIBLE (paned->child2) &&
       !GTK_WIDGET_MAPPED (paned->child2))
     gtk_widget_map (paned->child2);
+
+  gdk_window_show (widget->window);
 }
 
 static void
 gtk_paned_unmap (GtkWidget *widget)
 {
-  GtkPaned *paned;
-
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_PANED (widget));
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-  paned = GTK_PANED (widget);
-
-  gdk_window_clear_area (widget->window,
-                        widget->allocation.x,
-                        widget->allocation.y,
-                        widget->allocation.width,
-                        widget->allocation.height);
-  gdk_window_hide (paned->handle);
 
-  if (paned->child1 &&
-      GTK_WIDGET_VISIBLE (paned->child1) &&
-      GTK_WIDGET_MAPPED (paned->child1))
-    gtk_widget_unmap (paned->child1);
-  if (paned->child2 &&
-      GTK_WIDGET_VISIBLE (paned->child2) &&
-      GTK_WIDGET_MAPPED (paned->child2))
-    gtk_widget_unmap (paned->child2);
+  gdk_window_hide (widget->window);
 }
 
 static void
@@ -238,26 +271,32 @@ gtk_paned_unrealize (GtkWidget *widget)
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_PANED (widget));
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
   paned = GTK_PANED (widget);
 
-  gtk_style_detach (widget->style);
-
   if (paned->xor_gc)
-    gdk_gc_destroy (paned->xor_gc);
+    {
+      gdk_gc_destroy (paned->xor_gc);
+      paned->xor_gc = NULL;
+    }
+
   if (paned->handle)
-    gdk_window_destroy (paned->handle);
+    {
+      gdk_window_set_user_data (paned->handle, NULL);
+      gdk_window_destroy (paned->handle);
+      paned->handle = NULL;
+    }
 
-  paned->handle = NULL;
-  widget->window = NULL;
+  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
+
+
 static gint
 gtk_paned_expose (GtkWidget      *widget,
                  GdkEventExpose *event)
 {
   GtkPaned *paned;
-  GdkEventExpose child_event;
 
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_PANED (widget), FALSE);
@@ -267,95 +306,90 @@ gtk_paned_expose (GtkWidget      *widget,
     {
       paned = GTK_PANED (widget);
 
-      /* An expose event for the handle */
-      if (event->window == paned->handle)
-       {
-         gdk_window_set_background (paned->handle,
-                                    &widget->style->bg[widget->state]);
-         gdk_window_clear (paned->handle);
-         gtk_draw_shadow (widget->style, paned->handle,
-                          GTK_WIDGET_STATE(widget),
-                          GTK_SHADOW_OUT, 0, 0,
-                          paned->handle_size, paned->handle_size);
-       }
-      else
-       {
-         child_event = *event;
-         if (paned->child1 &&
-             GTK_WIDGET_NO_WINDOW (paned->child1) &&
-             gtk_widget_intersect (paned->child1, &event->area, &child_event.area))
-           gtk_widget_event (paned->child1, (GdkEvent*) &child_event);
-
-         if (paned->child2 &&
-             GTK_WIDGET_NO_WINDOW (paned->child2) &&
-             gtk_widget_intersect (paned->child2, &event->area, &child_event.area))
-           gtk_widget_event (paned->child2, (GdkEvent*) &child_event);
-
-         /* redraw the groove if necessary */
-         child_event.area = paned->groove_rectangle;
-         if (gtk_widget_intersect (widget, &event->area, &child_event.area))
-           gtk_widget_draw (widget, &child_event.area);
-       }
+      if (event->window != paned->handle)
+       (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
     }
+
   return FALSE;
 }
 
 void
-gtk_paned_add1 (GtkPaned     *paned,
-               GtkWidget    *widget)
+gtk_paned_add1 (GtkPaned  *paned,
+               GtkWidget *widget)
 {
-  g_return_if_fail (widget != NULL);
+  gtk_paned_pack1 (paned, widget, FALSE, TRUE);
+}
+
+void
+gtk_paned_add2 (GtkPaned  *paned,
+               GtkWidget *widget)
+{
+  gtk_paned_pack2 (paned, widget, TRUE, TRUE);
+}
+
+void
+gtk_paned_pack1 (GtkPaned  *paned,
+                GtkWidget *child,
+                gboolean   resize,
+                gboolean   shrink)
+{
+  g_return_if_fail (paned != NULL);
+  g_return_if_fail (GTK_IS_PANED (paned));
+  g_return_if_fail (GTK_IS_WIDGET (child));
 
   if (!paned->child1)
     {
-      gtk_widget_set_parent (widget, GTK_WIDGET (paned));
+      paned->child1 = child;
+      paned->child1_resize = resize;
+      paned->child1_shrink = shrink;
 
-      if (GTK_WIDGET_VISIBLE (widget->parent))
-       {
-         if (GTK_WIDGET_REALIZED (widget->parent) &&
-             !GTK_WIDGET_REALIZED (widget))
-           gtk_widget_realize (widget);
-         
-         if (GTK_WIDGET_MAPPED (widget->parent) &&
-             !GTK_WIDGET_MAPPED (widget))
-           gtk_widget_map (widget);
-       }
+      gtk_widget_set_parent (child, GTK_WIDGET (paned));
 
-      paned->child1 = widget;
+      if (GTK_WIDGET_REALIZED (child->parent))
+       gtk_widget_realize (child);
 
-      if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (paned))
-        gtk_widget_queue_resize (widget);
+      if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child))
+       {
+         if (GTK_WIDGET_MAPPED (child->parent))
+           gtk_widget_map (child);
+
+         gtk_widget_queue_resize (child);
+       }
     }
 }
 
 void
-gtk_paned_add2 (GtkPaned  *paned,
-               GtkWidget *widget)
+gtk_paned_pack2 (GtkPaned  *paned,
+                GtkWidget *child,
+                gboolean   resize,
+                gboolean   shrink)
 {
-  g_return_if_fail (widget != NULL);
+  g_return_if_fail (paned != NULL);
+  g_return_if_fail (GTK_IS_PANED (paned));
+  g_return_if_fail (GTK_IS_WIDGET (child));
 
   if (!paned->child2)
     {
-      gtk_widget_set_parent (widget, GTK_WIDGET (paned));
+      paned->child2 = child;
+      paned->child2_resize = resize;
+      paned->child2_shrink = shrink;
 
-      if (GTK_WIDGET_VISIBLE (widget->parent))
-       {
-         if (GTK_WIDGET_REALIZED (widget->parent) &&
-             !GTK_WIDGET_REALIZED (widget))
-           gtk_widget_realize (widget);
-         
-         if (GTK_WIDGET_MAPPED (widget->parent) &&
-             !GTK_WIDGET_MAPPED (widget))
-           gtk_widget_map (widget);
-       }
+      gtk_widget_set_parent (child, GTK_WIDGET (paned));
 
-      paned->child2 = widget;
+      if (GTK_WIDGET_REALIZED (child->parent))
+       gtk_widget_realize (child);
 
-      if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (paned))
-        gtk_widget_queue_resize (widget);
+      if (GTK_WIDGET_VISIBLE (child->parent) && GTK_WIDGET_VISIBLE (child))
+       {
+         if (GTK_WIDGET_MAPPED (child->parent))
+           gtk_widget_map (child);
+
+         gtk_widget_queue_resize (child);
+       }
     }
 }
 
+
 static void
 gtk_paned_add (GtkContainer *container,
               GtkWidget    *widget)
@@ -369,9 +403,9 @@ gtk_paned_add (GtkContainer *container,
   paned = GTK_PANED (container);
 
   if (!paned->child1)
-    gtk_paned_add1 (GTK_PANED (container),widget);
+    gtk_paned_add1 (GTK_PANED (container), widget);
   else if (!paned->child2)
-    gtk_paned_add2 (GTK_PANED (container),widget);
+    gtk_paned_add2 (GTK_PANED (container), widget);
 }
 
 static void
@@ -379,12 +413,14 @@ gtk_paned_remove (GtkContainer *container,
                  GtkWidget    *widget)
 {
   GtkPaned *paned;
+  gboolean was_visible;
 
   g_return_if_fail (container != NULL);
   g_return_if_fail (GTK_IS_PANED (container));
   g_return_if_fail (widget != NULL);
 
   paned = GTK_PANED (container);
+  was_visible = GTK_WIDGET_VISIBLE (widget);
 
   if (paned->child1 == widget)
     {
@@ -392,8 +428,8 @@ gtk_paned_remove (GtkContainer *container,
 
       paned->child1 = NULL;
 
-      if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
+      if (was_visible && GTK_WIDGET_VISIBLE (container))
+       gtk_widget_queue_resize (GTK_WIDGET (container));
     }
   else if (paned->child2 == widget)
     {
@@ -401,15 +437,16 @@ gtk_paned_remove (GtkContainer *container,
 
       paned->child2 = NULL;
 
-      if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
+      if (was_visible && GTK_WIDGET_VISIBLE (container))
+       gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
 
 static void
-gtk_paned_foreach (GtkContainer *container,
-                GtkCallback   callback,
-                gpointer      callback_data)
+gtk_paned_forall (GtkContainer *container,
+                 gboolean      include_internals,
+                 GtkCallback   callback,
+                 gpointer      callback_data)
 {
   GtkPaned *paned;
 
@@ -420,33 +457,104 @@ gtk_paned_foreach (GtkContainer *container,
   paned = GTK_PANED (container);
 
   if (paned->child1)
-    (* callback) (paned->child1, callback_data);
+    (*callback) (paned->child1, callback_data);
   if (paned->child2)
-    (* callback) (paned->child2, callback_data);
+    (*callback) (paned->child2, callback_data);
 }
 
+/**
+ * gtk_paned_get_position:
+ * @paned: a #GtkPaned widget
+ * 
+ * Obtains the position of the divider between the two panes.
+ * 
+ * Return value: position of the divider
+ **/
+gint
+gtk_paned_get_position (GtkPaned  *paned)
+{
+  g_return_val_if_fail (paned != NULL, 0);
+  g_return_val_if_fail (GTK_IS_PANED (paned), 0);
+
+  return paned->child1_size;
+}
+
+/**
+ * gtk_paned_set_position:
+ * @paned: a #GtkPaned widget
+ * @position: pixel position of divider
+ * 
+ * Sets the position of the divider between the two panes.
+ **/
 void
-gtk_paned_handle_size (GtkPaned *paned, guint16 size)
+gtk_paned_set_position (GtkPaned *paned,
+                       gint      position)
 {
-  gint x,y;
+  g_return_if_fail (paned != NULL);
+  g_return_if_fail (GTK_IS_PANED (paned));
 
-  if (paned->handle)
+  if (position >= 0)
     {
-      gdk_window_get_geometry (paned->handle, &x, &y, NULL, NULL, NULL);
-      gdk_window_move_resize (paned->handle,
-                              x + paned->handle_size / 2 - size / 2,
-                              y + paned->handle_size / 2 - size / 2,
-                              size, size);
+      /* We don't clamp here - the assumption is that
+       * if the total allocation changes at the same time
+       * as the position, the position set is with reference
+       * to the new total size. If only the position changes,
+       * then clamping will occur in gtk_paned_compute_position()
+       */
+      paned->child1_size = position;
+      paned->position_set = TRUE;
     }
-  
-  paned->handle_size = size;
+  else
+    {
+      paned->position_set = FALSE;
+    }
+
+  gtk_widget_queue_resize (GTK_WIDGET (paned));
 }
 
 void
-gtk_paned_gutter_size (GtkPaned *paned, guint16 size)
+gtk_paned_compute_position(GtkPaned *paned,
+                          gint      allocation,
+                          gint      child1_req,
+                          gint      child2_req)
 {
-  paned->gutter_size = size;
+  g_return_if_fail (paned != NULL);
+  g_return_if_fail (GTK_IS_PANED (paned));
+
+  paned->min_position = paned->child1_shrink ? 0 : child1_req;
+
+  paned->max_position = allocation;
+  if (!paned->child2_shrink)
+    paned->max_position = MAX (1, paned->max_position - child2_req);
+
+  if (!paned->position_set)
+    {
+      if (paned->child1_resize && !paned->child2_resize)
+       paned->child1_size = MAX (1, allocation - child2_req);
+      else if (!paned->child1_resize && paned->child2_resize)
+       paned->child1_size = child1_req;
+      else if (child1_req + child2_req != 0)
+       paned->child1_size = allocation * ((gdouble)child1_req / (child1_req + child2_req));
+      else
+       paned->child1_size = allocation * 0.5;
+    }
+  else
+    {
+      /* If the position was set before the initial allocation.
+       * (paned->last_allocation <= 0) just clamp it and leave it.
+       */
+      if (paned->last_allocation > 0)
+       {
+         if (paned->child1_resize && !paned->child2_resize)
+           paned->child1_size += allocation - paned->last_allocation;
+         else if (!(!paned->child1_resize && paned->child2_resize))
+           paned->child1_size = allocation * ((gdouble) paned->child1_size / (paned->last_allocation));
+       }
+    }
+
+  paned->child1_size = CLAMP (paned->child1_size,
+                             paned->min_position,
+                             paned->max_position);
 
-  if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)))
-    gtk_widget_queue_resize (GTK_WIDGET (paned));
+  paned->last_allocation = allocation;
 }