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

no need to include "appenv.h" 

2002-11-30  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpnavigationview.c: no need to include "appenv.h"

	* app/tools/gimpinktool.c: pass InkOptions as user_data to the
	ink_type_update() callback so we don't need to get them from
	"the_gimp". Removed inclusion of "app_procs.h".
This commit is contained in:
Michael Natterer 2002-11-30 22:55:01 +00:00 committed by Michael Natterer
parent 2342bae8bc
commit 7fe6f39fb4
5 changed files with 36 additions and 32 deletions

8
ChangeLog
View File

@ -1,3 +1,11 @@
2002-11-30 Michael Natterer <mitch@gimp.org>
* app/display/gimpnavigationview.c: no need to include "appenv.h"
* app/tools/gimpinktool.c: pass InkOptions as user_data to the
ink_type_update() callback so we don't need to get them from
"the_gimp". Removed inclusion of "app_procs.h".
2002-11-30 Michael Natterer <mitch@gimp.org>
* app/paint-funcs/paint-funcs.[ch]: added "gboolean use_mmx"

2
app/display/gimpnavigationeditor.c
View File

@ -44,8 +44,6 @@
#include "gimpdisplayshell-scroll.h"
#include "gimpnavigationview.h"
#include "app_procs.h"
#include "libgimp/gimpintl.h"

2
app/display/gimpnavigationview.c
View File

@ -44,8 +44,6 @@
#include "gimpdisplayshell-scroll.h"
#include "gimpnavigationview.h"
#include "app_procs.h"
#include "libgimp/gimpintl.h"

28
app/paint/gimpink.c
View File

@ -50,7 +50,6 @@
#include "paint_options.h"
#include "tool_manager.h"
#include "app_procs.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
@ -171,8 +170,6 @@ static void ink_finish (GimpInkTool *ink_tool,
GimpDrawable *drawable);
static void ink_cleanup (void);
static void ink_type_update (GtkWidget *radio_button,
BlobFunc function);
static gboolean blob_button_expose (GtkWidget *widget,
GdkEventExpose *event,
BlobFunc function);
@ -223,7 +220,7 @@ static gboolean brush_widget_motion_notify (GtkWidget *widget,
static GimpToolOptions * ink_options_new (GimpToolInfo *tool_info);
static void ink_options_reset (GimpToolOptions *tool_options);
static void ink_type_update (GtkWidget *radio_button,
BlobFunc function);
InkOptions *options);
/* local variables */
@ -1520,9 +1517,11 @@ ink_options_new (GimpToolInfo *tool_info)
gtk_container_add (GTK_CONTAINER (radio_button), blob);
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "gimp-item-data", blob_ellipse);
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (ink_type_update),
(gpointer) blob_ellipse);
options);
options->function_w[0] = radio_button;
@ -1536,9 +1535,11 @@ ink_options_new (GimpToolInfo *tool_info)
gtk_container_add (GTK_CONTAINER (radio_button), blob);
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "gimp-item-data", blob_square);
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (ink_type_update),
(gpointer) blob_square);
options);
options->function_w[1] = radio_button;
@ -1553,9 +1554,11 @@ ink_options_new (GimpToolInfo *tool_info)
gtk_container_add (GTK_CONTAINER (radio_button), blob);
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "gimp-item-data", blob_diamond);
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (ink_type_update),
(gpointer) blob_diamond);
options);
options->function_w[2] = radio_button;
@ -1641,15 +1644,12 @@ ink_options_reset (GimpToolOptions *tool_options)
}
static void
ink_type_update (GtkWidget *radio_button,
BlobFunc function)
ink_type_update (GtkWidget *radio_button,
InkOptions *options)
{
GimpToolInfo *tool_info;
InkOptions *options;
BlobFunc function;
tool_info = tool_manager_get_info_by_type (the_gimp, GIMP_TYPE_INK_TOOL);
options = (InkOptions *) tool_info->tool_options;
function = g_object_get_data (G_OBJECT (radio_button), "gimp-item-data");
if (GTK_TOGGLE_BUTTON (radio_button)->active)
options->function = function;

28
app/tools/gimpinktool.c
View File

@ -50,7 +50,6 @@
#include "paint_options.h"
#include "tool_manager.h"
#include "app_procs.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
@ -171,8 +170,6 @@ static void ink_finish (GimpInkTool *ink_tool,
GimpDrawable *drawable);
static void ink_cleanup (void);
static void ink_type_update (GtkWidget *radio_button,
BlobFunc function);
static gboolean blob_button_expose (GtkWidget *widget,
GdkEventExpose *event,
BlobFunc function);
@ -223,7 +220,7 @@ static gboolean brush_widget_motion_notify (GtkWidget *widget,
static GimpToolOptions * ink_options_new (GimpToolInfo *tool_info);
static void ink_options_reset (GimpToolOptions *tool_options);
static void ink_type_update (GtkWidget *radio_button,
BlobFunc function);
InkOptions *options);
/* local variables */
@ -1520,9 +1517,11 @@ ink_options_new (GimpToolInfo *tool_info)
gtk_container_add (GTK_CONTAINER (radio_button), blob);
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "gimp-item-data", blob_ellipse);
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (ink_type_update),
(gpointer) blob_ellipse);
options);
options->function_w[0] = radio_button;
@ -1536,9 +1535,11 @@ ink_options_new (GimpToolInfo *tool_info)
gtk_container_add (GTK_CONTAINER (radio_button), blob);
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "gimp-item-data", blob_square);
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (ink_type_update),
(gpointer) blob_square);
options);
options->function_w[1] = radio_button;
@ -1553,9 +1554,11 @@ ink_options_new (GimpToolInfo *tool_info)
gtk_container_add (GTK_CONTAINER (radio_button), blob);
gtk_box_pack_start (GTK_BOX (vbox), radio_button, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (radio_button), "gimp-item-data", blob_diamond);
g_signal_connect (G_OBJECT (radio_button), "toggled",
G_CALLBACK (ink_type_update),
(gpointer) blob_diamond);
options);
options->function_w[2] = radio_button;
@ -1641,15 +1644,12 @@ ink_options_reset (GimpToolOptions *tool_options)
}
static void
ink_type_update (GtkWidget *radio_button,
BlobFunc function)
ink_type_update (GtkWidget *radio_button,
InkOptions *options)
{
GimpToolInfo *tool_info;
InkOptions *options;
BlobFunc function;
tool_info = tool_manager_get_info_by_type (the_gimp, GIMP_TYPE_INK_TOOL);
options = (InkOptions *) tool_info->tool_options;
function = g_object_get_data (G_OBJECT (radio_button), "gimp-item-data");
if (GTK_TOGGLE_BUTTON (radio_button)->active)
options->function = function;