[gimp] app: Clarify GimpDockable tab widget interface

[Martin Nordholts <martinn src gnome org>]

commit d35f4d5db49334601f9ce2c9166d95929ef1a532
Author: Martin Nordholts <martinn src gnome org>
Date:   Sun Apr 18 17:42:26 2010 +0200

    app: Clarify GimpDockable tab widget interface
    
    The function gimp_dockable_get_tab_widget() and
    gimp_dockable_get_drag_widget are not getters, they create new
    widgets. Furthermore, gimp_dockable_get_tab_widget() doesn't use the
    instance tab style but takes a tab style paramter. Rename the
    functions to gimp_dockable_new_tab_widget_for_style() and
    gimp_dockable_new_drag_widget() to reflect this.

 app/widgets/gimpdockable.c |   16 ++++++++--------
 app/widgets/gimpdockable.h |    5 +++--
 app/widgets/gimpdockbook.c |   21 ++++++++++++---------
 3 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index e99ce9f..2ad8f09 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -800,7 +800,7 @@ gimp_dockable_get_icon (GimpDockable *dockable,
 }
 
 static GtkWidget *
-gimp_dockable_get_tab_widget_internal (GimpDockable *dockable,
+gimp_dockable_new_tab_widget_internal (GimpDockable *dockable,
                                        GimpContext  *context,
                                        GimpTabStyle  tab_style,
                                        GtkIconSize   size,
@@ -1100,20 +1100,20 @@ gimp_dockable_set_tab_style (GimpDockable *dockable,
 }
 
 GtkWidget *
-gimp_dockable_get_tab_widget (GimpDockable *dockable,
-                              GimpContext  *context,
-                              GimpTabStyle  tab_style,
-                              GtkIconSize   size)
+gimp_dockable_new_tab_widget_for_style (GimpDockable *dockable,
+                                        GimpContext  *context,
+                                        GimpTabStyle  tab_style,
+                                        GtkIconSize   size)
 {
   g_return_val_if_fail (GIMP_IS_DOCKABLE (dockable), NULL);
   g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
 
-  return gimp_dockable_get_tab_widget_internal (dockable, context,
+  return gimp_dockable_new_tab_widget_internal (dockable, context,
                                                 tab_style, size, FALSE);
 }
 
 GtkWidget *
-gimp_dockable_get_drag_widget (GimpDockable *dockable)
+gimp_dockable_new_drag_widget (GimpDockable *dockable)
 {
   GtkWidget *frame;
   GtkWidget *widget;
@@ -1123,7 +1123,7 @@ gimp_dockable_get_drag_widget (GimpDockable *dockable)
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
 
-  widget = gimp_dockable_get_tab_widget_internal (dockable,
+  widget = gimp_dockable_new_tab_widget_internal (dockable,
                                                   dockable->p->context,
                                                   GIMP_TAB_STYLE_ICON_BLURB,
                                                   GTK_ICON_SIZE_DND,
diff --git a/app/widgets/gimpdockable.h b/app/widgets/gimpdockable.h
index 6b6f444..1628c8e 100644
--- a/app/widgets/gimpdockable.h
+++ b/app/widgets/gimpdockable.h
@@ -88,11 +88,12 @@ gboolean        gimp_dockable_is_locked        (GimpDockable   *dockable);
 
 void            gimp_dockable_set_tab_style    (GimpDockable   *dockable,
                                                 GimpTabStyle    tab_style);
-GtkWidget     * gimp_dockable_get_tab_widget   (GimpDockable   *dockable,
+GtkWidget     * gimp_dockable_new_tab_widget_for_style
+                                               (GimpDockable   *dockable,
                                                 GimpContext    *context,
                                                 GimpTabStyle    tab_style,
                                                 GtkIconSize     size);
-GtkWidget     * gimp_dockable_get_drag_widget  (GimpDockable   *dockable);
+GtkWidget     * gimp_dockable_new_drag_widget  (GimpDockable   *dockable);
 void            gimp_dockable_set_context      (GimpDockable   *dockable,
                                                 GimpContext    *context);
 GimpUIManager * gimp_dockable_get_menu         (GimpDockable   *dockable,
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index 71946e4..acfc362 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -466,10 +466,12 @@ gimp_dockbook_add (GimpDockbook *dockbook,
 
   gimp_dockable_set_drag_handler (dockable, dockbook->p->drag_handler);
 
-  menu_widget = gimp_dockable_get_tab_widget (dockable,
-                                              gimp_dock_get_context (dockbook->p->dock),
-                                              GIMP_TAB_STYLE_ICON_BLURB,
-                                              MENU_WIDGET_ICON_SIZE);
+  /* For the notebook right-click menu, always use the icon style */
+  menu_widget =
+    gimp_dockable_new_tab_widget_for_style (dockable,
+                                            gimp_dock_get_context (dockbook->p->dock),
+                                            GIMP_TAB_STYLE_ICON_BLURB,
+                                            MENU_WIDGET_ICON_SIZE);
 
   g_return_if_fail (GTK_IS_WIDGET (menu_widget));
 
@@ -582,10 +584,11 @@ gimp_dockbook_create_tab_widget (GimpDockbook *dockbook,
                         "tab-icon-size", &tab_size,
                         NULL);
 
-  tab_widget = gimp_dockable_get_tab_widget (dockable,
-                                             gimp_dock_get_context (dockbook->p->dock),
-                                             gimp_dockable_get_tab_style (dockable),
-                                             tab_size);
+  tab_widget =
+    gimp_dockable_new_tab_widget_for_style (dockable,
+                                            gimp_dock_get_context (dockbook->p->dock),
+                                            gimp_dockable_get_tab_style (dockable),
+                                            tab_size);
 
   if (! GIMP_IS_VIEW (tab_widget))
     {
@@ -812,7 +815,7 @@ gimp_dockbook_tab_drag_begin (GtkWidget      *widget,
   gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
   gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (widget));
 
-  view = gimp_dockable_get_drag_widget (dockable);
+  view = gimp_dockable_new_drag_widget (dockable);
   gtk_container_add (GTK_CONTAINER (window), view);
   gtk_widget_show (view);