callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: remove the "shell" parameter from gimp_tool_dialog_new() and gui_new()

Browse Source
This commit is contained in:
Michael Natterer
2013-06-07 12:19:42 +02:00
parent 3def3a1ade
commit 88387d6e8d
8 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/display/gimptoolgui.c
View File

@ -121,7 +121,6 @@ gimp_tool_gui_finalize (GObject *object)
/**
* gimp_tool_gui_new:
* @tool_info: a #GimpToolInfo
* @shell: the parent display shell this gui
* @desc: a string to use in the gui header or %NULL to use the help
* field from #GimpToolInfo
* @...: a %NULL-terminated valist of button parameters as described in
@ -133,10 +132,9 @@ gimp_tool_gui_finalize (GObject *object)
* Return value: a new #GimpToolGui
**/
GimpToolGui *
gimp_tool_gui_new (GimpToolInfo *tool_info,
GimpDisplayShell *shell,
const gchar *desc,
gboolean overlay,
gimp_tool_gui_new (GimpToolInfo *tool_info,
const gchar *desc,
gboolean overlay,
...)
{
GimpToolGui *gui;
@ -144,7 +142,6 @@ gimp_tool_gui_new (GimpToolInfo *tool_info,
va_list args;
g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
gui = g_object_new (GIMP_TYPE_TOOL_GUI, NULL);
@ -173,7 +170,7 @@ gimp_tool_gui_new (GimpToolInfo *tool_info,
}
else
{
private->dialog = gimp_tool_dialog_new (tool_info, shell, desc, NULL);
private->dialog = gimp_tool_dialog_new (tool_info, desc, NULL);
va_start (args, overlay);
gimp_dialog_add_buttons_valist (GIMP_DIALOG (private->dialog), args);
@ -186,8 +183,6 @@ gimp_tool_gui_new (GimpToolInfo *tool_info,
gtk_widget_show (private->vbox);
}
gimp_tool_gui_set_shell (GIMP_TOOL_GUI (gui), shell);
return gui;
}
@ -257,6 +252,8 @@ gimp_tool_gui_show (GimpToolGui *gui)
private = GET_PRIVATE (gui);
g_return_if_fail (private->shell != NULL);
if (private->overlay)
{
if (! gtk_widget_get_parent (private->dialog))