[gimp] app: Add and use gimp_dock_window_new()



commit 7e5224f82883c0c58c26a02090d9ce3c828f288e
Author: Martin Nordholts <martinn src gnome org>
Date:   Wed Jan 6 11:35:25 2010 +0100

    app: Add and use gimp_dock_window_new()

 app/dialogs/dialogs-constructors.c |   24 +++++++----------
 app/widgets/gimpdockwindow.c       |   19 +++++++++++++
 app/widgets/gimpdockwindow.h       |   51 +++++++++++++++++++----------------
 3 files changed, 57 insertions(+), 37 deletions(-)
---
diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c
index 629885e..fc85926 100644
--- a/app/dialogs/dialogs-constructors.c
+++ b/app/dialogs/dialogs-constructors.c
@@ -234,13 +234,11 @@ dialogs_toolbox_dock_window_new (GimpDialogFactory *factory,
                                  GimpContext       *context,
                                  gint               view_size)
 {
-  return g_object_new (GIMP_TYPE_DOCK_WINDOW,
-                       "role",                   "gimp-toolbox",
-                       "ui-manager-name",        "<Toolbox>",
-                       "allow-dockbook-absence", TRUE,
-                       "dialog-factory",         factory,
-                       "context",                context,
-                       NULL);
+  return gimp_dock_window_new ("gimp-toolbox",
+                               "<Toolbox>",
+                               TRUE,
+                               factory,
+                               context);
 }
 
 GtkWidget *
@@ -256,13 +254,11 @@ dialogs_dock_window_new (GimpDialogFactory *factory,
                          GimpContext       *context,
                          gint               view_size)
 {
-  return g_object_new (GIMP_TYPE_DOCK_WINDOW,
-                       "role",                   "gimp-dock",
-                       "ui-manager-name",        "<Dock>",
-                       "allow-dockbook-absence", FALSE,
-                       "dialog-factory",         factory,
-                       "context",                context,
-                       NULL);
+  return gimp_dock_window_new ("gimp-dock",
+                               "<Dock>",
+                               FALSE,
+                               factory,
+                               context);
 }
 
 
diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c
index d998bfa..7094bc5 100644
--- a/app/widgets/gimpdockwindow.c
+++ b/app/widgets/gimpdockwindow.c
@@ -887,6 +887,25 @@ gimp_dock_window_remove_dock (GimpDockWindow *dock_window,
                                         dock_window);
 }
 
+GtkWidget *
+gimp_dock_window_new (const gchar       *role,
+                      const gchar       *ui_manager_name,
+                      gboolean           allow_dockbook_absence,
+                      GimpDialogFactory *factory,
+                      GimpContext       *context)
+{
+  g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
+  g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+  return g_object_new (GIMP_TYPE_DOCK_WINDOW,
+                       "role",                   role,
+                       "ui-manager-name",        ui_manager_name,
+                       "allow-dockbook-absence", allow_dockbook_absence,
+                       "dialog-factory",         factory,
+                       "context",                context,
+                       NULL);
+}
+
 gint
 gimp_dock_window_get_id (GimpDockWindow *dock_window)
 {
diff --git a/app/widgets/gimpdockwindow.h b/app/widgets/gimpdockwindow.h
index c935ffc..45f0839 100644
--- a/app/widgets/gimpdockwindow.h
+++ b/app/widgets/gimpdockwindow.h
@@ -56,30 +56,35 @@ struct _GimpDockWindowClass
 
 
 GType               gimp_dock_window_get_type               (void) G_GNUC_CONST;
-gint                gimp_dock_window_get_id                 (GimpDockWindow *dock_window);
-void                gimp_dock_window_add_dock               (GimpDockWindow *dock_window,
-                                                             GimpDock       *dock,
-                                                             gint            index);
-void                gimp_dock_window_remove_dock            (GimpDockWindow *dock_window,
-                                                             GimpDock       *dock);
-GimpUIManager     * gimp_dock_window_get_ui_manager         (GimpDockWindow *dock_window);
-GimpContext       * gimp_dock_window_get_context            (GimpDockWindow *dock);
-GimpDialogFactory * gimp_dock_window_get_dialog_factory     (GimpDockWindow *dock);
-GList             * gimp_dock_window_get_docks              (GimpDockWindow *dock_window);
-GimpDock          * gimp_dock_window_get_dock               (GimpDockWindow *dock_window);
-gboolean            gimp_dock_window_get_auto_follow_active (GimpDockWindow *menu_dock);
-void                gimp_dock_window_set_auto_follow_active (GimpDockWindow *menu_dock,
-                                                             gboolean        show);
-gboolean            gimp_dock_window_get_show_image_menu    (GimpDockWindow *menu_dock);
-void                gimp_dock_window_set_show_image_menu    (GimpDockWindow *menu_dock,
-                                                             gboolean        show);
-void                gimp_dock_window_setup                  (GimpDockWindow *dock_window,
-                                                             GimpDockWindow *template);
-void                gimp_dock_window_set_aux_info           (GimpDockWindow *dock,
-                                                             GList          *aux_info);
-GList             * gimp_dock_window_get_aux_info           (GimpDockWindow *dock);
+GtkWidget         * gimp_dock_window_new                    (const gchar       *role,
+                                                             const gchar       *ui_manager_name,
+                                                             gboolean           allow_dockbook_absence,
+                                                             GimpDialogFactory *factory,
+                                                             GimpContext       *context);
+gint                gimp_dock_window_get_id                 (GimpDockWindow    *dock_window);
+void                gimp_dock_window_add_dock               (GimpDockWindow    *dock_window,
+                                                             GimpDock          *dock,
+                                                             gint               index);
+void                gimp_dock_window_remove_dock            (GimpDockWindow    *dock_window,
+                                                             GimpDock          *dock);
+GimpUIManager     * gimp_dock_window_get_ui_manager         (GimpDockWindow    *dock_window);
+GimpContext       * gimp_dock_window_get_context            (GimpDockWindow    *dock);
+GimpDialogFactory * gimp_dock_window_get_dialog_factory     (GimpDockWindow    *dock);
+GList             * gimp_dock_window_get_docks              (GimpDockWindow    *dock_window);
+GimpDock          * gimp_dock_window_get_dock               (GimpDockWindow    *dock_window);
+gboolean            gimp_dock_window_get_auto_follow_active (GimpDockWindow    *menu_dock);
+void                gimp_dock_window_set_auto_follow_active (GimpDockWindow    *menu_dock,
+                                                             gboolean           show);
+gboolean            gimp_dock_window_get_show_image_menu    (GimpDockWindow    *menu_dock);
+void                gimp_dock_window_set_show_image_menu    (GimpDockWindow    *menu_dock,
+                                                             gboolean           show);
+void                gimp_dock_window_setup                  (GimpDockWindow    *dock_window,
+                                                             GimpDockWindow    *template);
+void                gimp_dock_window_set_aux_info           (GimpDockWindow    *dock,
+                                                             GList             *aux_info);
+GList             * gimp_dock_window_get_aux_info           (GimpDockWindow    *dock);
 
-GimpDockWindow    * gimp_dock_window_from_dock              (GimpDock       *dock);
+GimpDockWindow    * gimp_dock_window_from_dock              (GimpDock          *dock);
 
 
 #endif /* __GIMP_DOCK_WINDOW_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]