Commit 4c03fb5e authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Removed GCG:

2001-01-08  Michael Natterer  <mitch@gimp.org>

	Removed GCG:

	* app/colormap_dialog.gc
	* app/colormap_dialog.i.[ch]
	* app/colormap_dialog.p.h
	* app/colormap_dialog.t.h
	* app/gimp.gh
	* tools/gcg/*: removed.

	* app/colormap_dialog.[ch]: moved all the colormap_dialog stuff
	here and cleaned up the autogenerated code.

	* autogen.sh
	* configure.in
	* app/Makefile.am
	* app/app_procs.c
	* app/apptypes.h
	* app/color_notebook.h
	* app/commands.c
	* app/gimpset.h
	* po/POTFILES.in
	* tools/Makefile.am: changed accordingly.

	* libgimp/gimpunitmenu.c: s/class/klass/
parent ab014f8b
2001-01-08 Michael Natterer <mitch@gimp.org>
Removed GCG:
* app/colormap_dialog.gc
* app/colormap_dialog.i.[ch]
* app/colormap_dialog.p.h
* app/colormap_dialog.t.h
* app/gimp.gh
* tools/gcg/*: removed.
* app/colormap_dialog.[ch]: moved all the colormap_dialog stuff
here and cleaned up the autogenerated code.
* autogen.sh
* configure.in
* app/Makefile.am
* app/app_procs.c
* app/apptypes.h
* app/color_notebook.h
* app/commands.c
* app/gimpset.h
* po/POTFILES.in
* tools/Makefile.am: changed accordingly.
* libgimp/gimpunitmenu.c: s/class/klass/
2001-01-07 Michael Natterer <mitch@gimp.org>
* app/by_color_select.c
......@@ -19,7 +46,7 @@
* modules/colorsel_gtk.c
* modules/colorsel_triangle.c
* modules/colorsel_water.c: made the color_notebook, the color_area
and DND speak in terms of RGBA instead of GRB. The alpha value is
and DND speak in terms of RGBA instead of RGB. The alpha value is
not used yet, only the API changed. Everything should work exactly
as before.
......
......@@ -407,10 +407,6 @@ gimp_SOURCES = \
$(regex_sources)
EXTRA_DIST = \
colormap_dialog.i.c \
colormap_dialog.i.h \
colormap_dialog.p.h \
colormap_dialog.t.h \
makefile.mingw \
makefile.mingw.in \
makefile.msc \
......@@ -452,42 +448,3 @@ files:
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/app/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=app/$@ CONFIG_HEADERS= $(SHELL) ./config.status
# GCG stuff
#
# SUFFIXES = .gc .gh
#
# if WITH_GCG
# GCG = ../tools/gcg/gcg -I$(srcdir) -I$(top_srcdir)/tools/gcg/gh
# GEN_CODE = colormap_dialog.c
# if WITH_GNU_MAKE
# GEN_HEADER =$(subst .gc,.t.h,$(GCG_DEFS)) \
# $(subst .gc,.p.h,$(GCG_DEFS)) \
# $(subst .gc,.i.h,$(GCG_DEFS)) \
# $(subst .gc,.h,$(GCG_DEFS))
#
# $(GEN_CODE): %.c: %.gc
# $(GCG) -o $@ $<
# else # WITH_GNU_MAKE
# GEN_HEADER = # fill in here manually, if you bother
# .gc.c:
# $(GCG) -o $@ $<
# endif # WITH_GNU_MAKE
#
# BUILT_SOURCES = $(GEN_CODE) $(GEN_HEADER)
#
# if ENABLE_GCG_DEPS
# if WITH_GNU_MAKE
# # dependency magic
# GCGMAKEDEPEND = $(top_srcdir)/tools/gcg/gcgmakedepend
# $(DEF_DEPS): .deps/%.d: %.gc
# $(GCGMAKEDEPEND) $(DEF_INC) $< >$@
# automake uses .P for .c files, we use .d for .gc files, should
# be no conflict..
# GCG_DEFS = $(subst .c,.gc,$(GEN_CODE))
# DEF_DEPS = $(patsubst %.gc,.deps/%.d,$(GCG_DEFS))
# -include $(DEF_DEPS)
# endif # WITH_GNU_MAKE
# endif # ENABLE_GCG_DEPS
# endif # WITH_GCG
# end GCG stuff
......@@ -29,7 +29,7 @@
#include "about_dialog.h"
#include "app_procs.h"
#include "brush_select.h"
#include "colormap_dialog.i.h"
#include "colormap_dialog.h"
#include "color_area.h"
#include "commands.h"
#include "convert.h"
......@@ -1185,13 +1185,13 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
}
static void
dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer data)
dialogs_indexed_palette_select_callback (GimpColormapDialog *dialog,
gpointer data)
{
guchar *color;
GimpImage *image = colormap_dialog_image (dialog);
GimpImage *image = gimp_colormap_dialog_image (dialog);
color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
color = &image->cmap[gimp_colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (),
......@@ -1205,16 +1205,22 @@ void
dialogs_indexed_palette_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
static ColormapDialog *cmap_dlg;
static GimpColormapDialog *cmap_dlg;
if (!cmap_dlg)
{
cmap_dlg = colormap_dialog_create (image_context);
colormap_dialog_connect_selected (dialogs_indexed_palette_select_callback,
NULL, cmap_dlg);
cmap_dlg = gimp_colormap_dialog_create (image_context);
gtk_signal_connect
(GTK_OBJECT (cmap_dlg), "selected",
GTK_SIGNAL_FUNC (dialogs_indexed_palette_select_callback),
NULL);
}
gtk_widget_show (GTK_WIDGET (cmap_dlg));
if (! GTK_WIDGET_VISIBLE (cmap_dlg))
gtk_widget_show (GTK_WIDGET (cmap_dlg));
else
gdk_window_raise (GTK_WIDGET (cmap_dlg)->window);
}
void
......
......@@ -56,6 +56,7 @@
#include "gdisplay_ops.h"
#include "gimpbrushlist.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimprc.h"
#include "gimpparasite.h"
#include "gimpset.h"
......
......@@ -345,6 +345,8 @@ typedef enum /*< skip >*/
typedef struct _GimpObject GimpObject;
typedef struct _GimpSet GimpSet;
typedef guint GimpSetHandlerId;
typedef struct _GimpList GimpList;
typedef struct _GimpContext GimpContext;
......@@ -383,6 +385,8 @@ typedef struct _BezierSelect BezierSelect;
typedef struct _BoundSeg BoundSeg;
typedef struct _ColorNotebook ColorNotebook;
typedef struct _DrawCore DrawCore;
typedef struct _GDisplay GDisplay;
......
......@@ -36,8 +36,6 @@ typedef void (* ColorNotebookCallback) (gint red,
typedef struct _ColorSelectorInstance ColorSelectorInstance;
typedef struct _ColorNotebook ColorNotebook;
struct _ColorNotebook
{
GtkWidget *shell;
......
This diff is collapsed.
#include <gimp.gh>
#include <gtk.gh>
module Gimp.ColormapDialog;
import Gtk, g;
class ColormapDialog : Gtk.Dialog {
public static ColormapDialog* create(Set* context);
read-only Image* image;
read-only int col-index;
protected pre-emit void selected ();
Widget* vbox;
Preview* palette;
Widget* image-menu;
OptionMenu* option-menu;
Set* context;
uint event-handler;
int xn;
int yn;
int cellsize;
Entry* index-entry;
Entry* color-entry;
SetHandlerId rename-handler;
SetHandlerId cmap-changed-handler;
Widget* add-item;
.ColorNotebookP color-select;
}
......@@ -16,24 +16,64 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _g_gimp_colormap_dialog_funcs
#define _g_gimp_colormap_dialog_funcs
#include <colormap_dialog.t.h>
#include <gimpset.h>
#include <gimpimage.h>
GimpColormapDialog* gimp_colormap_dialog_create (
GimpSet* context);
GimpImage* gimp_colormap_dialog_image (
const GimpColormapDialog* colormap_dialog);
gint gimp_colormap_dialog_col_index (
const GimpColormapDialog* colormap_dialog);
typedef void (*GimpColormapDialogHandler_selected)(GimpColormapDialog*,
gpointer);
void gimp_colormap_dialog_connect_selected (
GimpColormapDialogHandler_selected handler,
gpointer user_data,
GimpColormapDialog* colormap_dialog);
#endif /* _g_gimp_colormap_dialog_funcs */
#ifndef __COLORMAP_DIALOG_H__
#define __COLORMAP_DIALOG_H__
#include <gtk/gtkdialog.h>
#define GIMP_TYPE_COLORMAP_DIALOG (gimp_colormap_dialog_get_type ())
#define GIMP_COLORMAP_DIALOG(obj) (GTK_CHECK_CAST((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialog))
#define GIMP_COLORMAP_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST((klass), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass))
#define GIMP_IS_COLORMAP_DIALOG(obj) (GTK_CHECK_TYPE((obj), GIMP_TYPE_COLORMAP_DIALOG))
#define GIMP_IS_COLORMAP_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GIMP_TYPE_COLORMAP_DIALOG))
typedef struct _GimpColormapDialog GimpColormapDialog;
typedef struct _GimpColormapDialogClass GimpColormapDialogClass;
struct _GimpColormapDialog
{
GtkDialog parent;
GimpImage *image;
gint col_index;
gint dnd_col_index;
GtkWidget *vbox;
GtkPreview *palette;
GtkWidget *image_menu;
GtkWidget *popup_menu;
GtkOptionMenu *option_menu;
GimpSet *context;
guint event_handler;
gint xn;
gint yn;
gint cellsize;
GtkWidget *index_spinbutton;
GtkAdjustment *index_adjustment;
GtkEntry *color_entry;
GimpSetHandlerId rename_handler;
GimpSetHandlerId cmap_changed_handler;
GtkWidget *add_item;
ColorNotebook *color_notebook;
};
struct _GimpColormapDialogClass
{
GtkDialogClass parent_class;
void (* selected) (GimpColormapDialog *gcd);
};
GtkType gimp_colormap_dialog_get_type (void);
GimpColormapDialog * gimp_colormap_dialog_create (GimpSet* context);
void gimp_colormap_dialog_selected (GimpColormapDialog *colormap_dialog);
GimpImage * gimp_colormap_dialog_image (const GimpColormapDialog *colormap_dialog);
gint gimp_colormap_dialog_col_index (const GimpColormapDialog *colormap_dialog);
#endif /* __COLORMAP_DIALOG_H__ */
This diff is collapsed.
#ifndef _g_gimp_colormap_dialog_import
#define _g_gimp_colormap_dialog_import
#include <colormap_dialog.h>
#define TYPE_COLORMAP_DIALOG GIMP_TYPE_COLORMAP_DIALOG
#define ColormapDialog GimpColormapDialog
#define IS_COLORMAP_DIALOG GIMP_IS_COLORMAP_DIALOG
#define COLORMAP_DIALOG GIMP_COLORMAP_DIALOG
#define colormap_dialog_create gimp_colormap_dialog_create
#define colormap_dialog_image gimp_colormap_dialog_image
#define colormap_dialog_col_index gimp_colormap_dialog_col_index
#define colormap_dialog_connect_selected gimp_colormap_dialog_connect_selected
#define colormap_dialog_selected gimp_colormap_dialog_selected
#endif /* _g_gimp_colormap_dialog_import */
#ifndef _g_gimp_colormap_dialog_prot
#define _g_gimp_colormap_dialog_prot
#include <colormap_dialog.h>
#include <gtk/gtkdialog.h>
#include <gimpimage.h>
#include <glib.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkpreview.h>
#include <gtk/gtkoptionmenu.h>
#include <gimpset.h>
#include <gtk/gtkentry.h>
#include <color_notebook.h>
typedef struct _GimpColormapDialogClass GimpColormapDialogClass;
struct _GimpColormapDialogClass {
GtkDialogClass parent_class;
void (*selected) (GimpColormapDialog*);
};
struct _GimpColormapDialog {
GtkDialog parent;
GimpImage* image;
gint col_index;
gint dnd_col_index;
GtkWidget* vbox;
GtkPreview* palette;
GtkWidget* image_menu;
GtkWidget* popup_menu;
GtkOptionMenu* option_menu;
GimpSet* context;
guint event_handler;
gint xn;
gint yn;
gint cellsize;
GtkWidget* index_spinbutton;
GtkAdjustment* index_adjustment;
GtkEntry* color_entry;
GimpSetHandlerId rename_handler;
GimpSetHandlerId cmap_changed_handler;
GtkWidget* add_item;
ColorNotebook *color_notebook;
};
void gimp_colormap_dialog_selected (
GimpColormapDialog* colormap_dialog);
#endif /* _g_gimp_colormap_dialog_prot */
#ifndef _g_gimp_colormap_dialog_type
#define _g_gimp_colormap_dialog_type
#include <gtk/gtktypeutils.h>
#define GIMP_TYPE_COLORMAP_DIALOG \
(_gimp_colormap_dialog_type ? (void)0 : _gimp_colormap_dialog_init_type (), _gimp_colormap_dialog_type)
extern GtkType _gimp_colormap_dialog_type;
void _gimp_colormap_dialog_init_type (void);
typedef struct _GimpColormapDialog GimpColormapDialog;
#define GIMP_IS_COLORMAP_DIALOG(o) GTK_CHECK_TYPE(o, GIMP_TYPE_COLORMAP_DIALOG)
#define GIMP_COLORMAP_DIALOG(o) GTK_CHECK_CAST(o, GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialog)
#endif /* _g_gimp_colormap_dialog_type */
......@@ -29,7 +29,7 @@
#include "about_dialog.h"
#include "app_procs.h"
#include "brush_select.h"
#include "colormap_dialog.i.h"
#include "colormap_dialog.h"
#include "color_area.h"
#include "commands.h"
#include "convert.h"
......@@ -1185,13 +1185,13 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
}
static void
dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer data)
dialogs_indexed_palette_select_callback (GimpColormapDialog *dialog,
gpointer data)
{
guchar *color;
GimpImage *image = colormap_dialog_image (dialog);
GimpImage *image = gimp_colormap_dialog_image (dialog);
color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
color = &image->cmap[gimp_colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (),
......@@ -1205,16 +1205,22 @@ void
dialogs_indexed_palette_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
static ColormapDialog *cmap_dlg;
static GimpColormapDialog *cmap_dlg;
if (!cmap_dlg)
{
cmap_dlg = colormap_dialog_create (image_context);
colormap_dialog_connect_selected (dialogs_indexed_palette_select_callback,
NULL, cmap_dlg);
cmap_dlg = gimp_colormap_dialog_create (image_context);
gtk_signal_connect
(GTK_OBJECT (cmap_dlg), "selected",
GTK_SIGNAL_FUNC (dialogs_indexed_palette_select_callback),
NULL);
}
gtk_widget_show (GTK_WIDGET (cmap_dlg));
if (! GTK_WIDGET_VISIBLE (cmap_dlg))
gtk_widget_show (GTK_WIDGET (cmap_dlg));
else
gdk_window_raise (GTK_WIDGET (cmap_dlg)->window);
}
void
......
......@@ -36,8 +36,6 @@ typedef void (* ColorNotebookCallback) (gint red,
typedef struct _ColorSelectorInstance ColorSelectorInstance;
typedef struct _ColorNotebook ColorNotebook;
struct _ColorNotebook
{
GtkWidget *shell;
......
#include <gcg.gh>
package Gimp <> {
module <gimpimage.h>{
class Image;
}
module <gimpobject.h>{
class Object;
}
module <gimplayer.h>{
class Layer;
}
module <gimpdrawable.h>{
class Drawable;
}
module <gimpset.h>{
class Set;
foreign SetHandlerId;
}
class ColormapDialog;
}
package {
module <color_select.h>{
foreign ColorSelectP;
}
module <color_notebook.h>{
foreign ColorNotebookP;
}
}
......@@ -66,8 +66,6 @@ struct _GimpSetClass
};
typedef guint GimpSetHandlerId;
GtkType gimp_set_get_type (void);
GimpSet * gimp_set_new (GtkType type,
gboolean weak);
......
......@@ -36,8 +36,6 @@ typedef void (* ColorNotebookCallback) (gint red,
typedef struct _ColorSelectorInstance ColorSelectorInstance;
typedef struct _ColorNotebook ColorNotebook;
struct _ColorNotebook
{
GtkWidget *shell;
......
This diff is collapsed.
......@@ -16,24 +16,64 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _g_gimp_colormap_dialog_funcs
#define _g_gimp_colormap_dialog_funcs
#include <colormap_dialog.t.h>
#include <gimpset.h>
#include <gimpimage.h>
GimpColormapDialog* gimp_colormap_dialog_create (
GimpSet* context);
GimpImage* gimp_colormap_dialog_image (
const GimpColormapDialog* colormap_dialog);
gint gimp_colormap_dialog_col_index (
const GimpColormapDialog* colormap_dialog);
typedef void (*GimpColormapDialogHandler_selected)(GimpColormapDialog*,
gpointer);
void gimp_colormap_dialog_connect_selected (
GimpColormapDialogHandler_selected handler,
gpointer user_data,
GimpColormapDialog* colormap_dialog);
#endif /* _g_gimp_colormap_dialog_funcs */
#ifndef __COLORMAP_DIALOG_H__
#define __COLORMAP_DIALOG_H__
#include <gtk/gtkdialog.h>
#define GIMP_TYPE_COLORMAP_DIALOG (gimp_colormap_dialog_get_type ())
#define GIMP_COLORMAP_DIALOG(obj) (GTK_CHECK_CAST((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialog))
#define GIMP_COLORMAP_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST((klass), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass))
#define GIMP_IS_COLORMAP_DIALOG(obj) (GTK_CHECK_TYPE((obj), GIMP_TYPE_COLORMAP_DIALOG))
#define GIMP_IS_COLORMAP_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), GIMP_TYPE_COLORMAP_DIALOG))
typedef struct _GimpColormapDialog GimpColormapDialog;
typedef struct _GimpColormapDialogClass GimpColormapDialogClass;
struct _GimpColormapDialog
{
GtkDialog parent;
GimpImage *image;
gint col_index;
gint dnd_col_index;
GtkWidget *vbox;
GtkPreview *palette;
GtkWidget *image_menu;
GtkWidget *popup_menu;
GtkOptionMenu *option_menu;
GimpSet *context;
guint event_handler;
gint xn;
gint yn;
gint cellsize;
GtkWidget *index_spinbutton;
GtkAdjustment *index_adjustment;
GtkEntry *color_entry;
GimpSetHandlerId rename_handler;
GimpSetHandlerId cmap_changed_handler;
GtkWidget *add_item;
ColorNotebook *color_notebook;
};
struct _GimpColormapDialogClass
{
GtkDialogClass parent_class;
void (* selected) (GimpColormapDialog *gcd);
};
GtkType gimp_colormap_dialog_get_type (void);
GimpColormapDialog * gimp_colormap_dialog_create (GimpSet* context);
void gimp_colormap_dialog_selected (GimpColormapDialog *colormap_dialog);
GimpImage * gimp_colormap_dialog_image (const GimpColormapDialog *colormap_dialog);
gint gimp_colormap_dialog_col_index (const GimpColormapDialog *colormap_dialog);
#endif /* __COLORMAP_DIALOG_H__ */
......@@ -29,7 +29,7 @@
#include "about_dialog.h"
#include "app_procs.h"
#include "brush_select.h"
#include "colormap_dialog.i.h"
#include "colormap_dialog.h"
#include "color_area.h"
#include "commands.h"
#include "convert.h"
......@@ -1185,13 +1185,13 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
}
static void
dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer data)
dialogs_indexed_palette_select_callback (GimpColormapDialog *dialog,
gpointer data)
{
guchar *color;
GimpImage *image = colormap_dialog_image (dialog);
GimpImage *image = gimp_colormap_dialog_image (dialog);
color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
color = &image->cmap[gimp_colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (),
......@@ -1205,16 +1205,22 @@ void
dialogs_indexed_palette_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
static ColormapDialog *cmap_dlg;
static GimpColormapDialog *cmap_dlg;
if (!cmap_dlg)
{
cmap_dlg = colormap_dialog_create (image_context);
colormap_dialog_connect_selected (dialogs_indexed_palette_select_callback,
NULL, cmap_dlg);
cmap_dlg = gimp_colormap_dialog_create (image_context);
gtk_signal_connect
(GTK_OBJECT (cmap_dlg), "selected",
GTK_SIGNAL_FUNC (dialogs_indexed_palette_select_callback),
NULL);
}
gtk_widget_show (GTK_WIDGET (cmap_dlg));
if (! GTK_WIDGET_VISIBLE (cmap_dlg))
gtk_widget_show (GTK_WIDGET (cmap_dlg));
else
gdk_window_raise (GTK_WIDGET (cmap_dlg)->window);
}
void
......
......@@ -29,7 +29,7 @@
#include "about_dialog.h"
#include "app_procs.h"
#include "brush_select.h"
#include "colormap_dialog.i.h"
#include "colormap_dialog.h"
#include "color_area.h"
#include "commands.h"
#include "convert.h"
......@@ -1185,13 +1185,13 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
}
static void
dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer data)
dialogs_indexed_palette_select_callback (GimpColormapDialog *dialog,
gpointer data)
{
guchar *color;
GimpImage *image = colormap_dialog_image (dialog);
GimpImage *image = gimp_colormap_dialog_image (dialog);
color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
color = &image->cmap[gimp_colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (),
......@@ -1205,16 +1205,22 @@ void
dialogs_indexed_palette_cmd_callback (GtkWidget *widget,
gpointer client_data)
{
static ColormapDialog *cmap_dlg;
static GimpColormapDialog *cmap_dlg;
if (!cmap_dlg)
{
cmap_dlg = colormap_dialog_create (image_context);
colormap_dialog_connect_selected (dialogs_indexed_palette_select_callback,
NULL, cmap_dlg);
cmap_dlg = gimp_colormap_dialog_create (image_context);
gtk_signal_connect
(GTK_OBJECT (cmap_dlg), "selected",
GTK_SIGNAL_FUNC (dialogs_indexed_palette_select_callback),
NULL);
}
gtk_widget_show (GTK_WIDGET (cmap_dlg));
if (! GTK_WIDGET_VISIBLE (cmap_dlg))
gtk_widget_show (GTK_WIDGET (cmap_dlg));
else
gdk_window_raise (GTK_WIDGET (cmap_dlg)->window);
}
void
......
......@@ -36,8 +36,6 @@ typedef void (* ColorNotebookCallback) (gint red,
typedef struct _ColorSelectorInstance ColorSelectorInstance;
typedef struct _ColorNotebook ColorNotebook;
struct _ColorNotebook
{
GtkWidget *shell;
......
This diff is collapsed.
......@@ -16,24 +16,64 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _g_gimp_colormap_dialog_funcs
#define _g_gimp_colormap_dialog_funcs
#include <colormap_dialog.t.h>
#include <gimpset.h>
#include <gimpimage.h>
GimpColormapDialog* gimp_colormap_dialog_create (
GimpSet* context);
GimpImage* gimp_colormap_dialog_image (
const GimpColormapDialog* colormap_dialog);
gint gimp_colormap_dialog_col_index (
const GimpColormapDialog* colormap_dialog);
typedef void (*GimpColormapDialogHandler_selected)(GimpColormapDialog*,
gpointer);
void gimp_colormap_dialog_connect_selected (
GimpColormapDialogHandler_selected handler,
gpointer user_data,
GimpColormapDialog* colormap_dialog);
#endif /* _g_gimp_colormap_dialog_funcs */
#ifndef __COLORMAP_DIALOG_H__
#define __COLORMAP_DIALOG_H__
#include <gtk/gtkdialog.h>