dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: gimp_dialog_factory_dock_new() -> _dock_with_window_new()

This commit is contained in:
Martin Nordholts 2009-12-01 21:42:24 +01:00
parent ae3c3291b0
commit 95bab5da5f
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/actions/windows-commands.c
View File

@ -107,8 +107,8 @@ windows_show_toolbox (void)
{ {
GtkWidget *toolbox; GtkWidget *toolbox;
toolbox = gimp_dialog_factory_dock_new (global_toolbox_factory, toolbox = gimp_dialog_factory_dock_with_window_new (global_toolbox_factory,
gdk_screen_get_default ()); gdk_screen_get_default ());
gtk_widget_show (toolbox); gtk_widget_show (toolbox);
} }

8
app/tests/test-window-management.c
View File

@ -92,10 +92,10 @@ gimp_test_window_roles (GimpTestFixture *fixture,
GimpDockWindow *dock_window = NULL; GimpDockWindow *dock_window = NULL;
GimpDockWindow *toolbox_window = NULL; GimpDockWindow *toolbox_window = NULL;
dock = gimp_dialog_factory_dock_new (global_dock_factory, dock = gimp_dialog_factory_dock_with_window_new (global_dock_factory,
gdk_screen_get_default ()); gdk_screen_get_default ());
toolbox = gimp_dialog_factory_dock_new (global_toolbox_factory, toolbox = gimp_dialog_factory_dock_with_window_new (global_toolbox_factory,
gdk_screen_get_default ()); gdk_screen_get_default ());
dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock)); dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
toolbox_window = gimp_dock_window_from_dock (GIMP_DOCK (toolbox)); toolbox_window = gimp_dock_window_from_dock (GIMP_DOCK (toolbox));

19
app/widgets/gimpdialogfactory.c
View File

@ -502,7 +502,7 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
{ {
GtkWidget *dockbook; GtkWidget *dockbook;
dock = gimp_dialog_factory_dock_new (factory, screen); dock = gimp_dialog_factory_dock_with_window_new (factory, screen);
dockbook = gimp_dockbook_new (factory->menu_factory); dockbook = gimp_dockbook_new (factory->menu_factory);
gimp_dock_add_book (GIMP_DOCK (dock), gimp_dock_add_book (GIMP_DOCK (dock),
@ -759,20 +759,21 @@ gimp_dialog_factory_dockable_new (GimpDialogFactory *factory,
} }
/** /**
* gimp_dialog_factory_dock_new: * gimp_dialog_factory_dock_with_window_new:
* @factory: a #GimpDialogFacotry * @factory: a #GimpDialogFacotry
* @screen: the #GdkScreen the dock should appear on * @screen: the #GdkScreen the dock window should appear on
* *
* Returns a new #GimpDock in this %factory's context. We use a function * Returns a new #GimpDock in this %factory's context, put inside a
* pointer passed to this %factory's constructor instead of simply * #GimpDockWindow. We use a function pointer passed to this
* gimp_dock_new() because we may want different instances of * %factory's constructor instead of simply gimp_dock_new() because we
* #GimpDialogFactory create different subclasses of #GimpDock. * may want different instances of #GimpDialogFactory create different
* subclasses of #GimpDock.
* *
* Return value: the newly created #GimpDock. * Return value: the newly created #GimpDock.
**/ **/
GtkWidget * GtkWidget *
gimp_dialog_factory_dock_new (GimpDialogFactory *factory, gimp_dialog_factory_dock_with_window_new (GimpDialogFactory *factory,
GdkScreen *screen) GdkScreen *screen)
{ {
GtkWidget *dock_window = NULL; GtkWidget *dock_window = NULL;
GtkWidget *dock = NULL; GtkWidget *dock = NULL;

2
app/widgets/gimpdialogfactory.h
View File

@ -159,7 +159,7 @@ GtkWidget * gimp_dialog_factory_dockable_new (GimpDialogFactory
GimpDock *dock, GimpDock *dock,
const gchar *identifier, const gchar *identifier,
gint view_size); gint view_size);
GtkWidget * gimp_dialog_factory_dock_new (GimpDialogFactory *factory, GtkWidget * gimp_dialog_factory_dock_with_window_new (GimpDialogFactory *factory,
GdkScreen *screen); GdkScreen *screen);
GtkWidget * gimp_dialog_factory_dock_window_new (GimpDialogFactory *factory, GtkWidget * gimp_dialog_factory_dock_window_new (GimpDialogFactory *factory,
GdkScreen *screen); GdkScreen *screen);

4
app/widgets/gimpdockable.c
View File

@ -1085,8 +1085,8 @@ gimp_dockable_detach (GimpDockable *dockable)
src_dock = gimp_dockbook_get_dock (dockable->dockbook); src_dock = gimp_dockbook_get_dock (dockable->dockbook);
dock = gimp_dialog_factory_dock_new (gimp_dock_get_dialog_factory (src_dock), dock = gimp_dialog_factory_dock_with_window_new (gimp_dock_get_dialog_factory (src_dock),
gtk_widget_get_screen (GTK_WIDGET (dockable))); gtk_widget_get_screen (GTK_WIDGET (dockable)));
dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock)); dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
gtk_window_set_position (GTK_WINDOW (dock_window), GTK_WIN_POS_MOUSE); gtk_window_set_position (GTK_WINDOW (dock_window), GTK_WIN_POS_MOUSE);
gimp_dock_setup (GIMP_DOCK (dock), src_dock); gimp_dock_setup (GIMP_DOCK (dock), src_dock);

2
app/widgets/gimpsessioninfo-dock.c
View File

@ -184,7 +184,7 @@ gimp_session_info_dock_restore (GimpSessionInfo *info,
g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory)); g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
g_return_if_fail (GDK_IS_SCREEN (screen)); g_return_if_fail (GDK_IS_SCREEN (screen));
dock = GIMP_DOCK (gimp_dialog_factory_dock_new (factory, screen)); dock = GIMP_DOCK (gimp_dialog_factory_dock_with_window_new (factory, screen));
dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock)); dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
if (dock && info->p->aux_info) if (dock && info->p->aux_info)