GDL: Drop placement patches

(bzr r10801)

17 files changed, 51 insertions, 281 deletions

diff --git a/src/libgdl/gdl-dock-bar.c b/src/libgdl/gdl-dock-bar.c
index f742a2d73..1d7b33b5f 100644
--- a/src/libgdl/gdl-dock-bar.c
+++ b/src/libgdl/gdl-dock-bar.c
@@ -244,7 +244,6 @@ gdl_dock_bar_item_clicked (GtkWidget   *button,
 {
     GdlDockBar *dockbar;
     GdlDockObject *controller;
-    (void)button;
 
     g_return_if_fail (item != NULL);
     
@@ -393,7 +392,6 @@ static void
 gdl_dock_bar_layout_changed_cb (GdlDockMaster *master,
                                 GdlDockBar    *dockbar)
 {
-    (void)master;
     update_dock_items (dockbar, FALSE);
 }
 
diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c
index b7c3d0f5b..c88c650a6 100644
--- a/src/libgdl/gdl-dock-item-grip.c
+++ b/src/libgdl/gdl-dock-item-grip.c
@@ -159,7 +159,6 @@ gdl_dock_item_grip_item_notify (GObject    *master,
 {
     GdlDockItemGrip *grip;
     gboolean cursor;
-    (void)master;
     
     grip = GDL_DOCK_ITEM_GRIP (data);
 
@@ -315,7 +314,6 @@ gdl_dock_item_grip_iconify_clicked (GtkWidget       *widget,
 {
     GtkWidget *parent;
     
-    (void)widget;
     g_return_if_fail (grip->item != NULL);
 
     /* Workaround to unhighlight the iconify button. */
@@ -644,8 +642,6 @@ static void
 gdl_dock_item_grip_add (GtkContainer *container,
                         GtkWidget    *widget)
 {
-    (void)container;
-    (void)widget;
     g_warning ("gtk_container_add not implemented for GdlDockItemGrip");
 }
 
@@ -653,7 +649,6 @@ static void
 gdl_dock_item_grip_remove (GtkContainer *container,
                            GtkWidget    *widget)
 {
-    (void)widget;
     gdl_dock_item_grip_set_label (GDL_DOCK_ITEM_GRIP (container), NULL);
 }
 
@@ -683,7 +678,6 @@ gdl_dock_item_grip_forall (GtkContainer *container,
 static GType
 gdl_dock_item_grip_child_type (GtkContainer *container)
 {
-    (void)container;
     return G_TYPE_NONE;
 }
 
diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c
index 5a979fd40..e58e19040 100644
--- a/src/libgdl/gdl-dock-item.c
+++ b/src/libgdl/gdl-dock-item.c
@@ -1032,7 +1032,6 @@ gdl_dock_item_style_set (GtkWidget *widget,
                          GtkStyle  *previous_style)
 {
     GdkWindow *window;
-    (void)previous_style;
 
     g_return_if_fail (widget != NULL);
     g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
@@ -1236,6 +1235,7 @@ gdl_dock_item_key_press (GtkWidget   *widget,
                          GdkEventKey *event)
 {
     gboolean event_handled = FALSE;
+    
     if (GDL_DOCK_ITEM_IN_DRAG (widget)) {
         if (event->keyval == GDK_Escape) {
             gdl_dock_item_drag_end (GDL_DOCK_ITEM (widget), TRUE);
@@ -1421,7 +1421,7 @@ gdl_dock_item_dock (GdlDockObject    *object,
             }
             if (req.width > 1)
                 g_object_set (object, "preferred-width", req.width, NULL);
-            if (req.height > 1 && object_req.height > req.height)
+            if (req.height > 1)
                 g_object_set (object, "preferred-height",
                               object_req.height - req.height, NULL);
             break;
@@ -1595,18 +1595,15 @@ gdl_dock_item_dock (GdlDockObject    *object,
                                
     if (parent)
         gdl_dock_object_thaw (parent);
-
-
 }
 
 static void
 gdl_dock_item_detach_menu (GtkWidget *widget,
                            GtkMenu   *menu)
 {
-    GdlDockItem *item = GDL_DOCK_ITEM(widget);
-
-    (void)menu;
-
+    GdlDockItem *item;
+   
+    item = GDL_DOCK_ITEM (widget);
     item->_priv->menu = NULL;
 }
 
@@ -1695,14 +1692,11 @@ gdl_dock_item_tab_button (GtkWidget      *widget,
 {
     GdlDockItem *item;
     GtkAllocation allocation;
-    
-    item = GDL_DOCK_ITEM(data);
 
-    (void)widget;
+    item = GDL_DOCK_ITEM (data);
 
-    if (!GDL_DOCK_ITEM_NOT_LOCKED (item)) {
+    if (!GDL_DOCK_ITEM_NOT_LOCKED (item))
         return;
-    }
 
     switch (event->button) {
     case 1:
@@ -1735,10 +1729,11 @@ static void
 gdl_dock_item_hide_cb (GtkWidget   *widget, 
                        GdlDockItem *item)
 {
-    (void)widget;
-
+    GdlDockMaster *master;
+    
     g_return_if_fail (item != NULL);
 
+    master = GDL_DOCK_OBJECT_GET_MASTER (item);
     gdl_dock_item_hide_item (item);
 }
 
@@ -1748,8 +1743,6 @@ gdl_dock_item_lock_cb (GtkWidget   *widget,
 {
     g_return_if_fail (item != NULL);
 
-    (void)widget;
-
     gdl_dock_item_lock (item);
 }
 
@@ -1759,8 +1752,6 @@ gdl_dock_item_unlock_cb (GtkWidget   *widget,
 {
     g_return_if_fail (item != NULL);
 
-    (void)widget;
-
     gdl_dock_item_unlock (item);
 }
 
@@ -1898,8 +1889,6 @@ gdl_dock_item_dock_to (GdlDockItem      *item,
                        GdlDockPlacement  position,
                        gint              docking_param)
 {
-    (void)docking_param;
-
     g_return_if_fail (item != NULL);
     g_return_if_fail (item != target);
     g_return_if_fail (target != NULL || position == GDL_DOCK_FLOATING);
diff --git a/src/libgdl/gdl-dock-master.c b/src/libgdl/gdl-dock-master.c
index d4dd6e363..294614c7e 100644
--- a/src/libgdl/gdl-dock-master.c
+++ b/src/libgdl/gdl-dock-master.c
@@ -82,8 +82,7 @@ enum {
     PROP_0,
     PROP_DEFAULT_TITLE,
     PROP_LOCKED,
-    PROP_SWITCHER_STYLE,
-    PROP_EXPANSION_DIRECTION
+    PROP_SWITCHER_STYLE
 };
 
 enum {
@@ -113,8 +112,6 @@ struct _GdlDockMasterPrivate {
     GHashTable     *unlocked_items;
     
     GdlSwitcherStyle switcher_style;
-
-    GdlDockExpansionDirection expansion_direction;
 };
 
 #define COMPUTE_LOCKED(master)                                          \
@@ -163,15 +160,6 @@ gdl_dock_master_class_init (GdlDockMasterClass *klass)
                            GDL_SWITCHER_STYLE_BOTH,
                            G_PARAM_READWRITE));
 
-    g_object_class_install_property (
-        g_object_class, PROP_EXPANSION_DIRECTION,
-        g_param_spec_enum ("expand-direction", _("Expand direction"),
-                           _("Allow the master's dock items to expand their container "
-                             "dock objects in the given direction"),
-                           GDL_TYPE_DOCK_EXPANSION_DIRECTION,
-                           GDL_DOCK_EXPANSION_DIRECTION_NONE,
-                           G_PARAM_READWRITE));
-
     master_signals [LAYOUT_CHANGED] = 
         g_signal_new ("layout-changed", 
                       G_TYPE_FROM_CLASS (klass),
@@ -198,7 +186,6 @@ gdl_dock_master_init (GdlDockMaster *master)
     master->_priv = g_new0 (GdlDockMasterPrivate, 1);
     master->_priv->number = 1;
     master->_priv->switcher_style = GDL_SWITCHER_STYLE_BOTH;
-    master->_priv->expansion_direction = GDL_DOCK_EXPANSION_DIRECTION_NONE;
     master->_priv->locked_items = g_hash_table_new (g_direct_hash, g_direct_equal);
     master->_priv->unlocked_items = g_hash_table_new (g_direct_hash, g_direct_equal);
 }
@@ -262,7 +249,6 @@ ht_foreach_build_slist (gpointer  key,
                         gpointer  value,
                         GSList  **slist)
 {
-    (void)key;
     *slist = g_slist_prepend (*slist, value);
 }
 
@@ -376,9 +362,6 @@ gdl_dock_master_set_property  (GObject      *object,
         case PROP_SWITCHER_STYLE:
             gdl_dock_master_set_switcher_style (master, g_value_get_enum (value));
             break;
-        case PROP_EXPANSION_DIRECTION:
-            master->_priv->expansion_direction = g_value_get_enum (value);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
             break;
@@ -403,9 +386,6 @@ gdl_dock_master_get_property  (GObject      *object,
         case PROP_SWITCHER_STYLE:
             g_value_set_enum (value, master->_priv->switcher_style);
             break;
-        case PROP_EXPANSION_DIRECTION:
-            g_value_set_enum (value, master->_priv->expansion_direction);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
             break;
@@ -597,7 +577,7 @@ gdl_dock_master_drag_motion (GdlDockItem *item,
           my_request.rect.width == request->rect.width &&
           my_request.rect.height == request->rect.height &&
           dock == master->_priv->rect_owner)) {
-        
+
         /* erase the previous rectangle */
         if (master->_priv->rect_drawn)
             gdl_dock_master_xor_rect (master);
@@ -617,7 +597,6 @@ _gdl_dock_master_foreach (gpointer key,
                           gpointer value,
                           gpointer user_data)
 {
-    (void)key;
     struct {
         GFunc    function;
         gpointer user_data;
@@ -726,11 +705,7 @@ item_dock_cb (GdlDockObject    *object,
               gpointer          user_data)
 {
     GdlDockMaster *master = user_data;
-
-    (void)object;
-    (void)position;
-    (void)other_data;
-
+    
     g_return_if_fail (requestor && GDL_IS_DOCK_OBJECT (requestor));
     g_return_if_fail (master && GDL_IS_DOCK_MASTER (master));
 
@@ -752,8 +727,6 @@ item_detach_cb (GdlDockObject *object,
 {
     GdlDockMaster *master = user_data;
     
-    (void)recursive;
-
     g_return_if_fail (object && GDL_IS_DOCK_OBJECT (object));
     g_return_if_fail (master && GDL_IS_DOCK_MASTER (master));
 
@@ -774,8 +747,6 @@ item_notify_cb (GdlDockObject *object,
     gint locked = COMPUTE_LOCKED (master);
     gboolean item_locked;
     
-    (void)pspec;
-
     g_object_get (object, "locked", &item_locked, NULL);
 
     if (item_locked) {
diff --git a/src/libgdl/gdl-dock-notebook.c b/src/libgdl/gdl-dock-notebook.c
index a14b9e09c..0ffaac902 100644
--- a/src/libgdl/gdl-dock-notebook.c
+++ b/src/libgdl/gdl-dock-notebook.c
@@ -155,7 +155,6 @@ gdl_dock_notebook_notify_cb (GObject    *g_object,
                              gpointer    user_data) 
 {
     g_return_if_fail (user_data != NULL && GDL_IS_DOCK_NOTEBOOK (user_data));
-    (void)g_object;
 
     /* chain the notify signal */
     g_object_notify (G_OBJECT (user_data), pspec->name);
@@ -166,12 +165,10 @@ gdl_dock_notebook_button_cb (GtkWidget      *widget,
                              GdkEventButton *event,
                              gpointer        user_data)
 {
-    (void)widget;
-    if (event->type == GDK_BUTTON_PRESS) {
+    if (event->type == GDK_BUTTON_PRESS)
         GDL_DOCK_ITEM_SET_FLAGS (user_data, GDL_DOCK_USER_ACTION);
-    } else {
+    else
         GDL_DOCK_ITEM_UNSET_FLAGS (user_data, GDL_DOCK_USER_ACTION);
-    }
 
     return FALSE;
 }
@@ -338,7 +335,6 @@ gdl_dock_notebook_forall (GtkContainer *container,
 static GType
 gdl_dock_notebook_child_type (GtkContainer *container)
 {
-    (void)container;
     return GDL_TYPE_DOCK_ITEM;
 }
     
diff --git a/src/libgdl/gdl-dock-object.c b/src/libgdl/gdl-dock-object.c
index da5e08d38..0fdae23e5 100644
--- a/src/libgdl/gdl-dock-object.c
+++ b/src/libgdl/gdl-dock-object.c
@@ -287,7 +287,6 @@ static void
 gdl_dock_object_foreach_detach (GdlDockObject *object,
                                 gpointer       user_data)
 {
-    (void)user_data;
     gdl_dock_object_detach (object, TRUE);
 }
 
@@ -454,9 +453,6 @@ gdl_dock_object_dock_unimplemented (GdlDockObject    *object,
                                     GdlDockPlacement  position,
                                     GValue           *other_data)
 {
-    (void)requestor;
-    (void)position;
-    (void)other_data;
     g_warning (_("Call to gdl_dock_object_dock in a dock object %p "
                  "(object type is %s) which hasn't implemented this method"),
                object, G_OBJECT_TYPE_NAME (object));
@@ -466,7 +462,6 @@ static void
 gdl_dock_object_real_present (GdlDockObject *object,
                               GdlDockObject *child)
 {
-    (void)child;
     gtk_widget_show (GTK_WIDGET (object));
 }
 
@@ -867,7 +862,7 @@ gdl_dock_param_get_type (void)
     static GType our_type = 0;
 
     if (our_type == 0) {
-        GTypeInfo tinfo = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        GTypeInfo tinfo = { 0, };
         our_type = g_type_register_static (G_TYPE_STRING, "GdlDockParam", &tinfo, 0);
 
         /* register known transform functions */
diff --git a/src/libgdl/gdl-dock-object.h b/src/libgdl/gdl-dock-object.h
index d1c27ffbd..d54e68c3c 100644
--- a/src/libgdl/gdl-dock-object.h
+++ b/src/libgdl/gdl-dock-object.h
@@ -66,14 +66,6 @@ typedef enum {
     GDL_DOCK_FLOATING
 } GdlDockPlacement;
 
-typedef enum {
-    GDL_DOCK_EXPANSION_DIRECTION_NONE = 0,
-    GDL_DOCK_EXPANSION_DIRECTION_UP,
-    GDL_DOCK_EXPANSION_DIRECTION_DOWN,
-    GDL_DOCK_EXPANSION_DIRECTION_LEFT,
-    GDL_DOCK_EXPANSION_DIRECTION_RIGHT
-} GdlDockExpansionDirection;
-
 typedef struct _GdlDockObject      GdlDockObject;
 typedef struct _GdlDockObjectClass GdlDockObjectClass;
 typedef struct _GdlDockRequest     GdlDockRequest;
diff --git a/src/libgdl/gdl-dock-paned.c b/src/libgdl/gdl-dock-paned.c
index f5fc88e47..42212d489 100644
--- a/src/libgdl/gdl-dock-paned.c
+++ b/src/libgdl/gdl-dock-paned.c
@@ -138,65 +138,6 @@ static void
 gdl_dock_paned_init (GdlDockPaned *paned)
 {
     paned->position_changed = FALSE;
-    paned->in_drag = FALSE;
-    paned->last_drag_position = -1;
-}
-
-static void
-gdl_dock_paned_resize_paned_ancestors (GdlDockPaned       *paned, 
-                                       GdlDockExpansionDirection  expansion_direction,
-                                       gint                diff)
-{
-     GtkWidget *widget, *last_widget;
-
-     g_return_if_fail (GDL_IS_DOCK_PANED (paned));
-
-     last_widget = GTK_WIDGET (paned);
-
-     /* make sure resizing only can be done in the drag direction */
-     if (expansion_direction == GDL_DOCK_EXPANSION_DIRECTION_NONE ||
-         ((expansion_direction == GDL_DOCK_EXPANSION_DIRECTION_DOWN || 
-           expansion_direction == GDL_DOCK_EXPANSION_DIRECTION_UP) && 
-          !GTK_IS_VPANED (GDL_DOCK_ITEM (paned)->child)) ||
-         ((expansion_direction == GDL_DOCK_EXPANSION_DIRECTION_LEFT || 
-           expansion_direction == GDL_DOCK_EXPANSION_DIRECTION_RIGHT) && 
-          !GTK_IS_HPANED (GDL_DOCK_ITEM (paned)->child)))
-     {         
-         return;
-     }
-
-     for (widget = gtk_widget_get_parent (GTK_WIDGET (paned)); widget != NULL; 
-          widget = gtk_widget_get_parent (widget)) {
-
-         if (GTK_IS_PANED (widget)) {
-
-             GtkPaned *paned = GTK_PANED (widget);
-
-                 if (last_widget == gtk_paned_get_child1 (paned)) {
-
-                     if (!GDL_IS_DOCK_OBJECT(gtk_widget_get_parent (widget))) {
-                         GtkRequisition requisition;
-                         GtkAllocation allocation;
-			 gtk_widget_get_allocation (gtk_paned_get_child1 (paned), &allocation);
-
-                         gtk_widget_size_request (gtk_paned_get_child1 (paned), &requisition);
-
-                         gint new_height =
-                             (allocation.height > requisition.height && diff > 0 ?
-                              allocation.height : requisition.height) + diff;
-
-                         gtk_widget_set_size_request (gtk_paned_get_child1 (paned), -1, new_height);
-                     }
-                     
-                     gtk_paned_set_position (paned, gtk_paned_get_position (paned) + diff);
-                 }
-             
-         } else if (!GDL_IS_DOCK_OBJECT (widget)) {
-             break;
-         }
-
-         last_widget = widget;
-     }
 }
 
 static void 
@@ -205,8 +146,7 @@ gdl_dock_paned_notify_cb (GObject    *g_object,
                           gpointer    user_data) 
 {
     GdlDockPaned *paned;
-    (void)g_object;
-
+    
     g_return_if_fail (user_data != NULL && GDL_IS_DOCK_PANED (user_data));
     
     /* chain the notification to the GdlDockPaned */
@@ -214,40 +154,8 @@ gdl_dock_paned_notify_cb (GObject    *g_object,
     
     paned = GDL_DOCK_PANED (user_data);
     
-    if (GDL_DOCK_ITEM_USER_ACTION (user_data) && !strcmp (pspec->name, "position")) {
-
-        GdlDockExpansionDirection expansion_direction;
-
+    if (GDL_DOCK_ITEM_USER_ACTION (user_data) && !strcmp (pspec->name, "position"))
         paned->position_changed = TRUE;
-
-        g_object_get (GDL_DOCK_OBJECT(paned)->master,
-                      "expand-direction", &expansion_direction,
-                      NULL);
-
-        switch (expansion_direction) {
-        case GDL_DOCK_EXPANSION_DIRECTION_DOWN:
-            if (paned->in_drag) {
-                gint max_position, position, diff;
-                g_object_get (GDL_DOCK_ITEM (paned)->child,
-                              "max-position", &max_position,
-                              "position", &position,
-                              NULL);
- 
-                diff = position - paned->last_drag_position;
-                paned->last_drag_position = position;
-
-                if (diff > 0 && position == max_position) {
-                    gdl_dock_paned_resize_paned_ancestors (paned, expansion_direction, diff + 1);
-                } else {
-                    gdl_dock_paned_resize_paned_ancestors (paned, expansion_direction, diff);
-                }
-                 
-            }
-            break;
-        default:
-            ;
-        }
-    }
 }
 
 static gboolean 
@@ -256,48 +164,13 @@ gdl_dock_paned_button_cb (GtkWidget      *widget,
                           gpointer        user_data)
 {
     GdlDockPaned *paned;
-    (void)widget;
     
     g_return_val_if_fail (user_data != NULL && GDL_IS_DOCK_PANED (user_data), FALSE);
     
     paned = GDL_DOCK_PANED (user_data);
     if (event->button == 1) {
-	if (event->type == GDK_BUTTON_PRESS) {
-
-            GdlDockExpansionDirection expansion_direction;
-
+        if (event->type == GDK_BUTTON_PRESS)
             GDL_DOCK_ITEM_SET_FLAGS (user_data, GDL_DOCK_USER_ACTION);
-
-            paned->in_drag = TRUE;
-
-            g_object_get (GDL_DOCK_OBJECT (paned)->master,
-                          "expand-direction", &expansion_direction,
-                          NULL);
-
-            switch (expansion_direction) {
-            case GDL_DOCK_EXPANSION_DIRECTION_DOWN:
-            {
-                gint max_position, position;
-                g_object_get (GDL_DOCK_ITEM (paned)->child,
-                              "max-position", &max_position,
-                              "position", &position,
-                              NULL);
-
-                paned->last_drag_position = position;
-                /* expand the paned's ancestors a bit if the separator is in max position
-                 * to allow dragging in all directions */
-                if (position == max_position)
-                    gdl_dock_paned_resize_paned_ancestors (paned, expansion_direction, 1);
-                break;
-            }
-            default:
-                ;
-            }
-        }
-        else if (event->type == GDK_BUTTON_RELEASE) {
-	     paned->last_drag_position = -1;
-	     paned->in_drag = FALSE;
-        }
         else {
             GDL_DOCK_ITEM_UNSET_FLAGS (user_data, GDL_DOCK_USER_ACTION);
             if (paned->position_changed) {
@@ -700,7 +573,7 @@ gdl_dock_paned_dock (GdlDockObject    *object,
                 gtk_paned_pack1 (paned, GTK_WIDGET (requestor), hresize, FALSE);
                 done = TRUE;
             } else if (!child2 && position == GDL_DOCK_BOTTOM) {
-                gtk_paned_pack2 (paned, GTK_WIDGET (requestor), TRUE, FALSE);
+                gtk_paned_pack2 (paned, GTK_WIDGET (requestor), hresize, FALSE);
                 done = TRUE;
             }
             break;
@@ -802,3 +675,4 @@ gdl_dock_paned_new (GtkOrientation orientation)
     
     return GTK_WIDGET (paned);
 }
+
diff --git a/src/libgdl/gdl-dock-paned.h b/src/libgdl/gdl-dock-paned.h
index 06b496491..2b4a40700 100644
--- a/src/libgdl/gdl-dock-paned.h
+++ b/src/libgdl/gdl-dock-paned.h
@@ -44,8 +44,6 @@ struct _GdlDockPaned {
     GdlDockItem  dock_item;
 
     gboolean     position_changed;
-    gboolean     in_drag;
-    gint         last_drag_position;
 };
 
 struct _GdlDockPanedClass {
diff --git a/src/libgdl/gdl-dock-placeholder.c b/src/libgdl/gdl-dock-placeholder.c
index b8fba9723..8cde7a51d 100644
--- a/src/libgdl/gdl-dock-placeholder.c
+++ b/src/libgdl/gdl-dock-placeholder.c
@@ -331,7 +331,7 @@ gdl_dock_placeholder_add (GtkContainer *container,
                           GtkWidget    *widget)
 {
     GdlDockPlaceholder *ph;
-    GdlDockPlacement    pos = GDL_DOCK_TOP;   /* default position */
+    GdlDockPlacement    pos = GDL_DOCK_CENTER;   /* default position */
     
     g_return_if_fail (GDL_IS_DOCK_PLACEHOLDER (container));
     g_return_if_fail (GDL_IS_DOCK_ITEM (widget));
@@ -349,7 +349,6 @@ gdl_dock_placeholder_detach (GdlDockObject *object,
                              gboolean       recursive)
 {
     GdlDockPlaceholder *ph = GDL_DOCK_PLACEHOLDER (object);
-    (void)recursive;
 
     /* disconnect handlers */
     disconnect_host (ph);
@@ -364,7 +363,6 @@ gdl_dock_placeholder_detach (GdlDockObject *object,
 static void 
 gdl_dock_placeholder_reduce (GdlDockObject *object)
 {
-    (void)object;
     /* placeholders are not reduced */
     return;
 }
@@ -538,8 +536,6 @@ static void
 gdl_dock_placeholder_present (GdlDockObject *object,
                               GdlDockObject *child)
 {
-    (void)object;
-    (void)child;
     /* do nothing */
     return;
 }
@@ -570,8 +566,7 @@ gdl_dock_placeholder_weak_notify (gpointer data,
                                   GObject *old_object)
 {
     GdlDockPlaceholder *ph;
-    (void)old_object;
-
+    
     g_return_if_fail (data != NULL && GDL_IS_DOCK_PLACEHOLDER (data));
 
     ph = GDL_DOCK_PLACEHOLDER (data);
@@ -603,7 +598,6 @@ detach_cb (GdlDockObject *object,
 {
     GdlDockPlaceholder *ph;
     GdlDockObject      *new_host, *obj;
-    (void)recursive;
 
     g_return_if_fail (user_data != NULL && GDL_IS_DOCK_PLACEHOLDER (user_data));
     
@@ -733,9 +727,7 @@ dock_cb (GdlDockObject    *object,
 {
     GdlDockPlacement    pos = GDL_DOCK_NONE;
     GdlDockPlaceholder *ph;
-    (void)position;
-    (void)other_data;
-
+    
     g_return_if_fail (user_data != NULL && GDL_IS_DOCK_PLACEHOLDER (user_data));
     ph = GDL_DOCK_PLACEHOLDER (user_data);
     g_return_if_fail (ph->_priv->host == object);
diff --git a/src/libgdl/gdl-dock-tablabel.c b/src/libgdl/gdl-dock-tablabel.c
index 65f87ab1d..441db3438 100644
--- a/src/libgdl/gdl-dock-tablabel.c
+++ b/src/libgdl/gdl-dock-tablabel.c
@@ -251,7 +251,6 @@ gdl_dock_tablabel_item_notify (GObject    *master,
     gboolean         locked;
     gchar           *label;
     GtkBin          *bin;
-    (void)pspec;
     
     g_object_get (master,
                   "locked", &locked,
diff --git a/src/libgdl/gdl-dock.c b/src/libgdl/gdl-dock.c
index 3b90f3757..6225864f0 100644
--- a/src/libgdl/gdl-dock.c
+++ b/src/libgdl/gdl-dock.c
@@ -36,6 +36,9 @@
 
 #include "libgdlmarshal.h"
 
+#ifndef __FUNCTION__
+#define __FUNCTION__ __func__
+#endif
 
 /* ----- Private prototypes ----- */
 
@@ -272,9 +275,7 @@ gdl_dock_floating_configure_event_cb (GtkWidget         *widget,
                                       gpointer           user_data)
 {
     GdlDock *dock;
-
-    (void)widget;
-
+    
     g_return_val_if_fail (user_data != NULL && GDL_IS_DOCK (user_data), TRUE);
 
     dock = GDL_DOCK (user_data);
@@ -489,10 +490,7 @@ gdl_dock_notify_cb (GObject    *object,
 {
     GdlDock *dock;
     gchar* long_name;
-
-    (void)pspec;
-    (void)user_data;
-
+    
     g_return_if_fail (object != NULL || GDL_IS_DOCK (object));
 
     g_object_get (object, "long-name", &long_name, NULL);
@@ -728,8 +726,6 @@ gdl_dock_forall (GtkContainer *container,
 {
     GdlDock *dock;
 
-    (void)include_internals;
-
     g_return_if_fail (container != NULL);
     g_return_if_fail (GDL_IS_DOCK (container));
     g_return_if_fail (callback != NULL);
@@ -743,7 +739,6 @@ gdl_dock_forall (GtkContainer *container,
 static GType
 gdl_dock_child_type (GtkContainer *container)
 {
-    (void)container;
     return GDL_TYPE_DOCK_ITEM;
 }
 
@@ -922,7 +917,7 @@ gdl_dock_dock (GdlDockObject    *object,
            GdlDock has been realized. */
         if (gtk_widget_get_realized (GTK_WIDGET (dock)))
             gtk_widget_realize (widget);
-
+        
         /* Map the widget if it's visible and the parent is visible and has 
            been mapped. This is done to make sure that the GdkWindow is 
            visible. */
@@ -1016,11 +1011,8 @@ gdl_dock_present (GdlDockObject *object,
 {
     GdlDock *dock = GDL_DOCK (object);
 
-    (void)child;
-
-    if (dock->_priv->floating) {
+    if (dock->_priv->floating)
         gtk_window_present (GTK_WINDOW (dock->_priv->window));
-    }
 }
 
 
@@ -1077,10 +1069,14 @@ gdl_dock_refine_placement (GdlDock *dock, GdlDockItem *dock_item,
     if (placement == GDL_DOCK_LEFT || placement == GDL_DOCK_RIGHT) {
         /* Check if dock_object touches center in terms of width */
         if (allocation.width/2 > object_size.width) {
-            return GDL_DOCK_TOP;
+            return GDL_DOCK_CENTER;
         }
-    } 
-
+    } else if (placement == GDL_DOCK_TOP || placement == GDL_DOCK_BOTTOM) {
+        /* Check if dock_object touches center in terms of height */
+        if (allocation.height/2 > object_size.height) {
+            return GDL_DOCK_CENTER;
+        }
+    }
     return placement;
 }
 
@@ -1096,8 +1092,6 @@ gdl_dock_select_larger_item (GdlDockItem *dock_item_1,
                              gint level /* for debugging */)
 {
     GtkRequisition size_1, size_2;
-
-    (void)level;
     
     g_return_val_if_fail (dock_item_1 != NULL, dock_item_2);
     g_return_val_if_fail (dock_item_2 != NULL, dock_item_1);
@@ -1221,7 +1215,7 @@ gdl_dock_add_item (GdlDock          *dock,
         /* Non-floating item. */
         if (dock->root) {
             GdlDockPlacement local_placement;
-            /* GtkRequisition preferred_size; */
+            GtkRequisition preferred_size;
             
             best_dock_item =
                 gdl_dock_find_best_placement_item (GDL_DOCK_ITEM (dock->root),
diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c
index 183ae66c0..fa52aa714 100644
--- a/src/libgdl/gdl-switcher.c
+++ b/src/libgdl/gdl-switcher.c
@@ -318,8 +318,8 @@ layout_buttons (GdlSwitcher *switcher)
 
     rows_count = num_btns / btns_per_row;
     if (num_btns % btns_per_row != 0)
-        rows_count++;
-     
+	rows_count++;
+    
     /* Assign buttons to rows */
     rows = g_new0 (GSList *, rows_count);
 
@@ -653,9 +653,7 @@ gdl_switcher_switch_page_cb (GtkNotebook *nb, GtkWidget *page_widget,
                              gint page_num, GdlSwitcher *switcher)
 {
     gint             switcher_id;
-
-    (void)nb;
-    (void)page_num;
+    
     /* Change switcher button */
     switcher_id = gdl_switcher_get_page_id (page_widget);
     gdl_switcher_select_button (GDL_SWITCHER (switcher), switcher_id);
diff --git a/src/libgdl/libgdlmarshal.c b/src/libgdl/libgdlmarshal.c
index 764f6fed0..a2a9fe220 100644
--- a/src/libgdl/libgdlmarshal.c
+++ b/src/libgdl/libgdlmarshal.c
@@ -1,3 +1,4 @@
+#include "libgdlmarshal.h"
 
 #include	<glib-object.h>
 
@@ -21,6 +22,7 @@
 #define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
 #define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
 #define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#define g_marshal_value_peek_variant(v)  g_value_get_variant (v)
 #else /* !G_ENABLE_DEBUG */
 /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
  *          Do not access GValues directly in your code. Instead, use the
@@ -44,6 +46,7 @@
 #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
 #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
 #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v)  (v)->data[0].v_pointer
 #endif /* !G_ENABLE_DEBUG */
 
 
@@ -54,10 +57,10 @@
 /* VOID:INT,INT (./libgdlmarshal.list:3) */
 void
 gdl_marshal_VOID__INT_INT (GClosure     *closure,
-                           GValue       *return_value,
+                           GValue       *return_value G_GNUC_UNUSED,
                            guint         n_param_values,
                            const GValue *param_values,
-                           gpointer      invocation_hint,
+                           gpointer      invocation_hint G_GNUC_UNUSED,
                            gpointer      marshal_data)
 {
   typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer     data1,
@@ -91,10 +94,10 @@ gdl_marshal_VOID__INT_INT (GClosure     *closure,
 /* VOID:UINT,UINT (./libgdlmarshal.list:4) */
 void
 gdl_marshal_VOID__UINT_UINT (GClosure     *closure,
-                             GValue       *return_value,
+                             GValue       *return_value G_GNUC_UNUSED,
                              guint         n_param_values,
                              const GValue *param_values,
-                             gpointer      invocation_hint,
+                             gpointer      invocation_hint G_GNUC_UNUSED,
                              gpointer      marshal_data)
 {
   typedef void (*GMarshalFunc_VOID__UINT_UINT) (gpointer     data1,
@@ -130,10 +133,10 @@ gdl_marshal_VOID__UINT_UINT (GClosure     *closure,
 /* VOID:OBJECT,ENUM,BOXED (./libgdlmarshal.list:6) */
 void
 gdl_marshal_VOID__OBJECT_ENUM_BOXED (GClosure     *closure,
-                                     GValue       *return_value,
+                                     GValue       *return_value G_GNUC_UNUSED,
                                      guint         n_param_values,
                                      const GValue *param_values,
-                                     gpointer      invocation_hint,
+                                     gpointer      invocation_hint G_GNUC_UNUSED,
                                      gpointer      marshal_data)
 {
   typedef void (*GMarshalFunc_VOID__OBJECT_ENUM_BOXED) (gpointer     data1,
diff --git a/src/libgdl/libgdltypebuiltins.c b/src/libgdl/libgdltypebuiltins.c
index b8f985273..b347fe6f5 100644
--- a/src/libgdl/libgdltypebuiltins.c
+++ b/src/libgdl/libgdltypebuiltins.c
@@ -64,26 +64,6 @@ gdl_dock_placement_get_type (void)
   return type;
 }
 
-static const GEnumValue _gdl_dock_expansion_direction_values[] = {
-  { GDL_DOCK_EXPANSION_DIRECTION_NONE, "GDL_DOCK_EXPANSION_DIRECTION_NONE", "none" },
-  { GDL_DOCK_EXPANSION_DIRECTION_UP, "GDL_DOCK_EXPANSION_DIRECTION_UP", "up" },
-  { GDL_DOCK_EXPANSION_DIRECTION_DOWN, "GDL_DOCK_EXPANSION_DIRECTION_DOWN", "down" },
-  { GDL_DOCK_EXPANSION_DIRECTION_LEFT, "GDL_DOCK_EXPANSION_DIRECTION_LEFT", "left" },
-  { GDL_DOCK_EXPANSION_DIRECTION_RIGHT, "GDL_DOCK_EXPANSION_DIRECTION_RIGHT", "right" },
-  { 0, NULL, NULL }
-};
-
-GType
-gdl_dock_expansion_direction_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type)
-    type = g_enum_register_static ("GdlDockExpansionDirection", _gdl_dock_expansion_direction_values);
-
-  return type;
-}
-
 
 /* enumerations from "gdl-dock-master.h" */
 static const GEnumValue _gdl_switcher_style_values[] = {
diff --git a/src/libgdl/libgdltypebuiltins.h b/src/libgdl/libgdltypebuiltins.h
index a49194ad6..19eac4989 100644
--- a/src/libgdl/libgdltypebuiltins.h
+++ b/src/libgdl/libgdltypebuiltins.h
@@ -16,8 +16,6 @@ GType gdl_dock_param_flags_get_type (void);
 GType gdl_dock_object_flags_get_type (void);
 #define GDL_TYPE_DOCK_PLACEMENT gdl_dock_placement_get_type()
 GType gdl_dock_placement_get_type (void);
-#define GDL_TYPE_DOCK_EXPANSION_DIRECTION gdl_dock_expansion_direction_get_type()
-GType gdl_dock_expansion_direction_get_type (void);
 
 /* --- gdl-dock-master.h --- */
 #define GDL_TYPE_SWITCHER_STYLE gdl_switcher_style_get_type()
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 627b01e27..f58aeae10 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -82,7 +82,6 @@ Dock::Dock(Gtk::Orientation orientation)
 
     g_object_set (GDL_DOCK_OBJECT(_gdl_dock)->master,
                   "switcher-style", gdl_switcher_style,
-                  "expand-direction", GDL_DOCK_EXPANSION_DIRECTION_DOWN,
                   NULL);
 
     GdlDockBarStyle gdl_dock_bar_style =