a3f44d8b0f
2002-06-17 Michael Natterer <mitch@gimp.org> Separated tool_options creation from tool registration so we don't implicitly create widgets before gui_init(): * libgimptool/gimptooltypes.h: removed GimpToolOptionsNewFunc typedef here... * app/core/core-types.h: ...and added it here. * libgimpproxy/gimpproxytypes.h: regenerated. * app/core/gimptoolinfo.[ch]: added a GimpToolOptionsNewFunc pointer to remember the constructor. Fixed the finalize() method (bug was never noticed because we leaked all tool infos) * app/tools/tool_manager.[ch]: moved tool_options creation to the new function tool_manager_restore(). Unref the tool infos after adding them to their container. Added "brush" and "gradient" to the context properties which are defined for tool contexts. * app/app_procs.c: call tool_manager_restore() after gui_init(). * app/gui/gui.c: removed the hack introduced recently and call render_setup() in gui_init() again, not in gui_themes_init(). Use the correct contexts now that they are properly initialized at the time of tool_options creation: * app/tools/gimpblendtool.c: use tool_info->context, not gimp_get_user_context() to get/set the tool's gradient. * app/paint/gimppaintcore.[ch] (gimp_paint_core_start): added a GimpPaintOptions paramater and get the brush to use from paint_options->context (instead of gimp_get_current_context()). * app/paint/gimppaintcore-stroke.c * app/tools/gimppainttool.c: changed accordingly. * app/tools/paint_options.c: added a brush preview to the paint options.
63 lines
2.5 KiB
C
63 lines
2.5 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995-2002 Spencer Kimball, Peter Mattis, and others
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __GIMP_TOOL_TYPES_H__
|
|
#define __GIMP_TOOL_TYPES_H__
|
|
|
|
|
|
#include "gimptoolenums.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
|
|
/* tools */
|
|
|
|
typedef struct _GimpTool GimpTool;
|
|
typedef struct _GimpToolModule GimpToolModule;
|
|
typedef struct _GimpToolControl GimpToolControl;
|
|
|
|
typedef struct _GimpPaintTool GimpPaintTool;
|
|
typedef struct _GimpDrawTool GimpDrawTool;
|
|
typedef struct _GimpPathTool GimpPathTool;
|
|
typedef struct _GimpTransformTool GimpTransformTool;
|
|
|
|
|
|
/* functions */
|
|
|
|
typedef void (* GimpToolOptionsResetFunc) (GimpToolOptions *tool_options);
|
|
|
|
typedef void (* GimpToolRegisterCallback) (GType tool_type,
|
|
GimpToolOptionsNewFunc options_new_func,
|
|
gboolean tool_context,
|
|
const gchar *identifier,
|
|
const gchar *blurb,
|
|
const gchar *help,
|
|
const gchar *menu_path,
|
|
const gchar *menu_accel,
|
|
const gchar *help_domain,
|
|
const gchar *help_data,
|
|
const gchar *stock_id,
|
|
gpointer register_data);
|
|
|
|
typedef void (* GimpToolRegisterFunc) (GimpToolRegisterCallback callback,
|
|
gpointer register_data);
|
|
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GIMP_TOOLS_TYPES_H__ */
|