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

app/color_panel.[ch] app/color_picker.c removed the public function 

2000-04-03  Michael Natterer  <mitch@gimp.org>

	* app/color_panel.[ch]
	* app/color_picker.c
	* app/qmask.c: removed the public function color_panel_free() and
	fake a real widget's behaviour by connecting to the panel widget's
	"destroy" signal.

	* app/channels_dialog.c
	* app/layers_dialog.c: cleaned up and sync'ed the code where
	possible (without changing the logic).
This commit is contained in:
Michael Natterer 2000-04-03 15:40:30 +00:00 committed by Michael Natterer
parent f9fdb4fcc1
commit 8ed5f8ce06
18 changed files with 1310 additions and 1248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2000-04-03 Michael Natterer <mitch@gimp.org>
* app/color_panel.[ch]
* app/color_picker.c
* app/qmask.c: removed the public function color_panel_free() and
fake a real widget's behaviour by connecting to the panel widget's
"destroy" signal.
* app/channels_dialog.c
* app/layers_dialog.c: cleaned up and sync'ed the code where
possible (without changing the logic).
2000-04-03 Michael Natterer <mitch@gimp.org>
* app/channels_dialog.c

2
app/actions/qmask-commands.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

2
app/actions/quick-mask-commands.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

509
app/channels_dialog.c
View File

File diff suppressed because it is too large Load Diff

103
app/color_panel.c
View File

@ -41,15 +41,27 @@ struct _ColorPanelPrivate
};
/* local function prototypes */
static void color_panel_draw (ColorPanel *);
static gint color_panel_events (GtkWidget *, GdkEvent *);
static void color_panel_select_callback (gint, gint, gint,
ColorNotebookState, void *);
static void color_panel_free (ColorPanel *color_panel);
static void color_panel_draw (ColorPanel *color_panel);
static gint color_panel_events (GtkWidget *widget,
GdkEvent *event,
gpointer data);
static void color_panel_select_callback (gint r,
gint g,
gint b,
ColorNotebookState state,
gpointer data);
static void color_panel_drag_color (GtkWidget *,
guchar *, guchar *, guchar *, gpointer);
static void color_panel_drop_color (GtkWidget *,
guchar, guchar, guchar, gpointer);
static void color_panel_drag_color (GtkWidget *widget,
guchar *r,
guchar *g,
guchar *b,
gpointer data);
static void color_panel_drop_color (GtkWidget *widget,
guchar r,
guchar g,
guchar b,
gpointer data);
/* dnd stuff */
static GtkTargetEntry color_panel_target_table[] =
@ -95,7 +107,6 @@ color_panel_new (guchar *initial,
gtk_signal_connect (GTK_OBJECT (private->drawing_area), "event",
(GtkSignalFunc) color_panel_events,
color_panel);
gtk_object_set_user_data (GTK_OBJECT (private->drawing_area), color_panel);
gtk_container_add (GTK_CONTAINER (color_panel->color_panel_widget),
private->drawing_area);
gtk_widget_show (private->drawing_area);
@ -117,29 +128,14 @@ color_panel_new (guchar *initial,
gimp_dnd_color_dest_set (private->drawing_area,
color_panel_drop_color, color_panel);
gtk_signal_connect_object (GTK_OBJECT (color_panel->color_panel_widget),
"destroy",
GTK_SIGNAL_FUNC (color_panel_free),
(GtkObject *) color_panel);
return color_panel;
}
void
color_panel_free (ColorPanel *color_panel)
{
ColorPanelPrivate *private;
private = (ColorPanelPrivate *) color_panel->private_part;
/* make sure we hide and free color_notebook */
if (private->color_notebook)
{
color_notebook_hide (private->color_notebook);
color_notebook_free (private->color_notebook);
}
if (private->gc)
gdk_gc_destroy (private->gc);
g_free (color_panel->private_part);
g_free (color_panel);
}
void
color_panel_set_color (ColorPanel *color_panel,
guchar *col)
@ -160,6 +156,27 @@ color_panel_set_color (ColorPanel *color_panel,
/* private functions */
static void
color_panel_free (ColorPanel *color_panel)
{
ColorPanelPrivate *private;
private = (ColorPanelPrivate *) color_panel->private_part;
/* make sure we hide and free color_notebook */
if (private->color_notebook)
{
color_notebook_hide (private->color_notebook);
color_notebook_free (private->color_notebook);
}
if (private->gc)
gdk_gc_destroy (private->gc);
g_free (color_panel->private_part);
g_free (color_panel);
}
static void
color_panel_draw (ColorPanel *color_panel)
{
@ -181,13 +198,14 @@ color_panel_draw (ColorPanel *color_panel)
static gint
color_panel_events (GtkWidget *widget,
GdkEvent *event)
GdkEvent *event,
gpointer data)
{
GdkEventButton *bevent;
ColorPanel *color_panel;
ColorPanelPrivate *private;
color_panel = (ColorPanel *) gtk_object_get_user_data (GTK_OBJECT (widget));
color_panel = (ColorPanel *) data;
private = (ColorPanelPrivate *) color_panel->private_part;
switch (event->type)
@ -251,16 +269,16 @@ color_panel_events (GtkWidget *widget,
}
static void
color_panel_select_callback (gint r,
gint g,
gint b,
ColorNotebookState state,
void *client_data)
color_panel_select_callback (gint r,
gint g,
gint b,
ColorNotebookState state,
gpointer data)
{
ColorPanel *color_panel;
ColorPanelPrivate *private;
color_panel = (ColorPanel *) client_data;
color_panel = (ColorPanel *) data;
private = (ColorPanelPrivate *) color_panel->private_part;
if (private->color_notebook)
@ -290,7 +308,9 @@ color_panel_drag_color (GtkWidget *widget,
guchar *b,
gpointer data)
{
ColorPanel *color_panel = data;
ColorPanel *color_panel;
color_panel = (ColorPanel *) data;
*r = color_panel->color[0];
*g = color_panel->color[1];
@ -304,8 +324,11 @@ color_panel_drop_color (GtkWidget *widget,
guchar b,
gpointer data)
{
ColorPanel *color_panel = data;
ColorPanelPrivate *private = (ColorPanelPrivate *) color_panel->private_part;
ColorPanel *color_panel;
ColorPanelPrivate *private;
color_panel = (ColorPanel *) data;
private = (ColorPanelPrivate *) color_panel->private_part;
color_panel->color[0] = r;
color_panel->color[1] = g;

1
app/color_panel.h
View File

@ -35,7 +35,6 @@ struct _ColorPanel
ColorPanel * color_panel_new (guchar *initial,
gint width,
gint height);
void color_panel_free (ColorPanel *color_panel);
void color_panel_set_color (ColorPanel *color_panel,
guchar *col);

1
app/color_picker.c
View File

@ -754,7 +754,6 @@ tools_free_color_picker (Tool *tool)
info_dialog_free (color_picker_info);
color_picker_info = NULL;
color_panel_free (color_panel);
color_panel = NULL;
}

2
app/core/gimpimage-qmask.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

2
app/core/gimpimage-quick-mask.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

2
app/display/gimpdisplayshell-qmask.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

509
app/gui/channels-dialog.c
View File

File diff suppressed because it is too large Load Diff

652
app/gui/layers-dialog.c
View File

File diff suppressed because it is too large Load Diff

2
app/gui/qmask-commands.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

652
app/layers_dialog.c
View File

File diff suppressed because it is too large Load Diff

2
app/qmask.c
View File

@ -372,7 +372,6 @@ edit_qmask_query_ok_callback (GtkWidget *widget,
options->gimage->qmask_opacity = (gint) 100*opacity/255;
}
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}
@ -385,7 +384,6 @@ edit_qmask_query_cancel_callback (GtkWidget *widget,
options = (EditQmaskOptions *) client_data;
color_panel_free (options->color_panel);
gtk_widget_destroy (options->query_box);
g_free (options);
}

1
app/tools/color_picker.c
View File

@ -754,7 +754,6 @@ tools_free_color_picker (Tool *tool)
info_dialog_free (color_picker_info);
color_picker_info = NULL;
color_panel_free (color_panel);
color_panel = NULL;
}

103
app/widgets/gimpcolorpanel.c
View File

@ -41,15 +41,27 @@ struct _ColorPanelPrivate
};
/* local function prototypes */
static void color_panel_draw (ColorPanel *);
static gint color_panel_events (GtkWidget *, GdkEvent *);
static void color_panel_select_callback (gint, gint, gint,
ColorNotebookState, void *);
static void color_panel_free (ColorPanel *color_panel);
static void color_panel_draw (ColorPanel *color_panel);
static gint color_panel_events (GtkWidget *widget,
GdkEvent *event,
gpointer data);
static void color_panel_select_callback (gint r,
gint g,
gint b,
ColorNotebookState state,
gpointer data);
static void color_panel_drag_color (GtkWidget *,
guchar *, guchar *, guchar *, gpointer);
static void color_panel_drop_color (GtkWidget *,
guchar, guchar, guchar, gpointer);
static void color_panel_drag_color (GtkWidget *widget,
guchar *r,
guchar *g,
guchar *b,
gpointer data);
static void color_panel_drop_color (GtkWidget *widget,
guchar r,
guchar g,
guchar b,
gpointer data);
/* dnd stuff */
static GtkTargetEntry color_panel_target_table[] =
@ -95,7 +107,6 @@ color_panel_new (guchar *initial,
gtk_signal_connect (GTK_OBJECT (private->drawing_area), "event",
(GtkSignalFunc) color_panel_events,
color_panel);
gtk_object_set_user_data (GTK_OBJECT (private->drawing_area), color_panel);
gtk_container_add (GTK_CONTAINER (color_panel->color_panel_widget),
private->drawing_area);
gtk_widget_show (private->drawing_area);
@ -117,29 +128,14 @@ color_panel_new (guchar *initial,
gimp_dnd_color_dest_set (private->drawing_area,
color_panel_drop_color, color_panel);
gtk_signal_connect_object (GTK_OBJECT (color_panel->color_panel_widget),
"destroy",
GTK_SIGNAL_FUNC (color_panel_free),
(GtkObject *) color_panel);
return color_panel;
}
void
color_panel_free (ColorPanel *color_panel)
{
ColorPanelPrivate *private;
private = (ColorPanelPrivate *) color_panel->private_part;
/* make sure we hide and free color_notebook */
if (private->color_notebook)
{
color_notebook_hide (private->color_notebook);
color_notebook_free (private->color_notebook);
}
if (private->gc)
gdk_gc_destroy (private->gc);
g_free (color_panel->private_part);
g_free (color_panel);
}
void
color_panel_set_color (ColorPanel *color_panel,
guchar *col)
@ -160,6 +156,27 @@ color_panel_set_color (ColorPanel *color_panel,
/* private functions */
static void
color_panel_free (ColorPanel *color_panel)
{
ColorPanelPrivate *private;
private = (ColorPanelPrivate *) color_panel->private_part;
/* make sure we hide and free color_notebook */
if (private->color_notebook)
{
color_notebook_hide (private->color_notebook);
color_notebook_free (private->color_notebook);
}
if (private->gc)
gdk_gc_destroy (private->gc);
g_free (color_panel->private_part);
g_free (color_panel);
}
static void
color_panel_draw (ColorPanel *color_panel)
{
@ -181,13 +198,14 @@ color_panel_draw (ColorPanel *color_panel)
static gint
color_panel_events (GtkWidget *widget,
GdkEvent *event)
GdkEvent *event,
gpointer data)
{
GdkEventButton *bevent;
ColorPanel *color_panel;
ColorPanelPrivate *private;
color_panel = (ColorPanel *) gtk_object_get_user_data (GTK_OBJECT (widget));
color_panel = (ColorPanel *) data;
private = (ColorPanelPrivate *) color_panel->private_part;
switch (event->type)
@ -251,16 +269,16 @@ color_panel_events (GtkWidget *widget,
}
static void
color_panel_select_callback (gint r,
gint g,
gint b,
ColorNotebookState state,
void *client_data)
color_panel_select_callback (gint r,
gint g,
gint b,
ColorNotebookState state,
gpointer data)
{
ColorPanel *color_panel;
ColorPanelPrivate *private;
color_panel = (ColorPanel *) client_data;
color_panel = (ColorPanel *) data;
private = (ColorPanelPrivate *) color_panel->private_part;
if (private->color_notebook)
@ -290,7 +308,9 @@ color_panel_drag_color (GtkWidget *widget,
guchar *b,
gpointer data)
{
ColorPanel *color_panel = data;
ColorPanel *color_panel;
color_panel = (ColorPanel *) data;
*r = color_panel->color[0];
*g = color_panel->color[1];
@ -304,8 +324,11 @@ color_panel_drop_color (GtkWidget *widget,
guchar b,
gpointer data)
{
ColorPanel *color_panel = data;
ColorPanelPrivate *private = (ColorPanelPrivate *) color_panel->private_part;
ColorPanel *color_panel;
ColorPanelPrivate *private;
color_panel = (ColorPanel *) data;
private = (ColorPanelPrivate *) color_panel->private_part;
color_panel->color[0] = r;
color_panel->color[1] = g;

1
app/widgets/gimpcolorpanel.h
View File

@ -35,7 +35,6 @@ struct _ColorPanel
ColorPanel * color_panel_new (guchar *initial,
gint width,
gint height);
void color_panel_free (ColorPanel *color_panel);
void color_panel_set_color (ColorPanel *color_panel,
guchar *col);