Commit b9c23cac authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

select the standard tool.

2004-06-28  Sven Neumann  <sven@gimp.org>

	* app/gui/gui.c (gui_initialize_after_callback): select the
	standard tool.

	* app/tools/tool_manager.c: cosmetics.
parent 3ec1647d
2004-06-28 Sven Neumann <sven@gimp.org>
* app/gui/gui.c (gui_initialize_after_callback): select the
standard tool.
* app/tools/tool_manager.c: cosmetics.
2004-06-28 Michael Natterer <mitch@gimp.org> 2004-06-28 Michael Natterer <mitch@gimp.org>
* app/tools/gimplevelstool.c: reverted fix for bug #141930. These * app/tools/gimplevelstool.c: reverted fix for bug #141930. These
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "core/gimpcontext.h" #include "core/gimpcontext.h"
#include "core/gimpenvirontable.h" #include "core/gimpenvirontable.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimptoolinfo.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h" #include "display/gimpdisplay-foreach.h"
...@@ -272,6 +273,9 @@ gui_initialize_after_callback (Gimp *gimp, ...@@ -272,6 +273,9 @@ gui_initialize_after_callback (Gimp *gimp,
} }
gimp_tools_init (gimp); gimp_tools_init (gimp);
gimp_context_set_tool (gimp_get_user_context (gimp),
gimp_tool_info_get_standard (gimp));
} }
static void static void
......
...@@ -150,9 +150,7 @@ tool_manager_select_tool (Gimp *gimp, ...@@ -150,9 +150,7 @@ tool_manager_select_tool (Gimp *gimp,
if (tool_manager->active_tool) if (tool_manager->active_tool)
{ {
GimpDisplay *gdisp; GimpDisplay *gdisp = tool_manager->active_tool->gdisp;
gdisp = tool_manager->active_tool->gdisp;
if (! gdisp && GIMP_IS_DRAW_TOOL (tool_manager->active_tool)) if (! gdisp && GIMP_IS_DRAW_TOOL (tool_manager->active_tool))
gdisp = GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp; gdisp = GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp;
...@@ -454,14 +452,12 @@ tool_manager_tool_changed (GimpContext *user_context, ...@@ -454,14 +452,12 @@ tool_manager_tool_changed (GimpContext *user_context,
GimpToolInfo *tool_info, GimpToolInfo *tool_info,
gpointer data) gpointer data)
{ {
GimpToolManager *tool_manager; GimpToolManager *tool_manager = data;
GimpTool *new_tool = NULL; GimpTool *new_tool = NULL;
if (! tool_info) if (! tool_info)
return; return;
tool_manager = (GimpToolManager *) data;
/* FIXME: gimp_busy HACK */ /* FIXME: gimp_busy HACK */
if (user_context->gimp->busy) if (user_context->gimp->busy)
{ {
...@@ -507,9 +503,7 @@ tool_manager_tool_changed (GimpContext *user_context, ...@@ -507,9 +503,7 @@ tool_manager_tool_changed (GimpContext *user_context,
tool_manager->active_tool->tool_info && tool_manager->active_tool->tool_info &&
tool_manager->active_tool->tool_info->context_props) tool_manager->active_tool->tool_info->context_props)
{ {
GimpToolInfo *old_tool_info; GimpToolInfo *old_tool_info = tool_manager->active_tool->tool_info;
old_tool_info = tool_manager->active_tool->tool_info;
gimp_context_set_parent (GIMP_CONTEXT (old_tool_info->tool_options), NULL); gimp_context_set_parent (GIMP_CONTEXT (old_tool_info->tool_options), NULL);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment