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

reverted palette.c 

It was broked.

adrian
This commit is contained in:
Adrian Likins 1998-10-18 21:49:45 +00:00
parent 9ed79357db
commit f07d9f7310
3 changed files with 36 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/gui/palette-editor.c
View File

@ -59,7 +59,6 @@ struct _Palette {
GtkWidget *color_area; GtkWidget *color_area;
GtkWidget *color_name; GtkWidget *color_name;
GtkWidget *palette_ops; GtkWidget *palette_ops;
GtkWidget *clist;
GdkGC *gc; GdkGC *gc;
GtkAdjustment *sbar_data; GtkAdjustment *sbar_data;
PaletteEntriesP entries; PaletteEntriesP entries;
@ -111,8 +110,6 @@ static int num_palette_entries = 0;
static unsigned char foreground[3] = { 0, 0, 0 }; static unsigned char foreground[3] = { 0, 0, 0 };
static unsigned char background[3] = { 255, 255, 255 }; static unsigned char background[3] = { 255, 255, 255 };
static PaletteEntriesP p_entries = NULL;
/* Color select dialog */ /* Color select dialog */
/* static ColorSelectP color_select = NULL; /* static ColorSelectP color_select = NULL;
static int color_select_active = 0; */ static int color_select_active = 0; */
@ -149,13 +146,11 @@ palettes_free ()
void void
palette_create () palette_create ()
{ {
/* why isnt this stuff in the Palette struct? */
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *sbar; GtkWidget *sbar;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *options_box; GtkWidget *options_box;
GtkWidget *clist_box;
GtkWidget *arrow_hbox; GtkWidget *arrow_hbox;
GtkWidget *label; GtkWidget *label;
GtkWidget *arrow; GtkWidget *arrow;
@ -172,7 +167,7 @@ palette_create ()
palette->color_select = NULL; palette->color_select = NULL;
palette->color_select_active = 0; palette->color_select_active = 0;
palette->scroll_offset = 0; palette->scroll_offset = 0;
palette->gc = NULL;\ palette->gc = NULL;
palette->updating = FALSE; palette->updating = FALSE;
/* The shell and main vbox */ /* The shell and main vbox */
@ -194,10 +189,6 @@ palette_create ()
options_box = gtk_hbox_new (FALSE, 1); options_box = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0);
/* the clist box */
clist_box = gtk_hbox_new(FALSE, 1);
gtk_box_pack_start(GTK_BOX(vbox), clist_box, FALSE, FALSE, 0);
/* The popup menu -- palette_ops */ /* The popup menu -- palette_ops */
for (i = 0; palette_ops[i].label; i++) for (i = 0; palette_ops[i].label; i++)
palette_ops[i].user_data = palette; palette_ops[i].user_data = palette;
@ -225,28 +216,11 @@ palette_create ()
gtk_widget_show (menu_bar_item); gtk_widget_show (menu_bar_item);
gtk_widget_show (menu_bar); gtk_widget_show (menu_bar);
/* the clist */
palette->clist = gtk_clist_new(1); /* one column */
/* dont forget the callback */
/* It isn't necessary to shadow the border, but it looks nice :) */
gtk_clist_set_border(GTK_CLIST(palette->clist), GTK_SHADOW_OUT);
gtk_clist_set_column_width (GTK_CLIST(palette->clist), 0, 100);
/* slap the clist in place of the option menu for testing */
gtk_box_pack_start (GTK_BOX (clist_box), palette->clist, TRUE, TRUE, 0);
gtk_widget_show(palette->clist);
gtk_signal_connect(GTK_OBJECT(palette->clist), "select_row",
GTK_SIGNAL_FUNC(palette_entries_set_callback),
(gpointer) p_entries);
/* The option menu */ /* The option menu */
/* slap both of them into that box for now... */ palette->option_menu = gtk_option_menu_new ();
/* palette->option_menu = gtk_option_menu_new (); */ gtk_box_pack_start (GTK_BOX (options_box), palette->option_menu, TRUE, TRUE, 0);
/* gtk_box_pack_start (GTK_BOX (options_box), palette->option_menu, TRUE, TRUE, 0); */ gtk_widget_show (palette->option_menu);
/* gtk_widget_show (palette->option_menu); */ gtk_widget_show (options_box);
/* gtk_widget_show (options_box); */
gtk_widget_show(clist_box);
/* The active color name */ /* The active color name */
palette->color_name = gtk_entry_new (); palette->color_name = gtk_entry_new ();
@ -468,7 +442,7 @@ palette_create_palette_menu (PaletteP palette,
{ {
GtkWidget *menu_item; GtkWidget *menu_item;
GSList *list; GSList *list;
/* PaletteEntriesP p_entries = NULL; */ PaletteEntriesP p_entries = NULL;
PaletteEntriesP found_entries = NULL; PaletteEntriesP found_entries = NULL;
int i = 0; int i = 0;
int default_index = -1; int default_index = -1;
@ -494,18 +468,12 @@ palette_create_palette_menu (PaletteP palette,
default_index = i; default_index = i;
} }
/* add each palette to the clist */ menu_item = gtk_menu_item_new_with_label (p_entries->name);
/* casting? */ gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
gtk_clist_append( (GtkCList*)(palette->clist), &p_entries->name); (GtkSignalFunc) palette_entries_set_callback,
(gpointer) p_entries);
gtk_container_add (GTK_CONTAINER (palette->menu), menu_item);
gtk_widget_show (menu_item);
/* menu_item = gtk_menu_item_new_with_label (p_entries->name); */
/* gtk_signal_connect (GTK_OBJECT (menu_item), "activate", */
/* (GtkSignalFunc) palette_entries_set_callback, */
/* (gpointer) p_entries); */
/* gtk_container_add (GTK_CONTAINER (palette->menu), menu_item); */
/* gtk_widget_show (menu_item); */
i++; i++;
} }

56
app/palette.c
View File

@ -59,7 +59,6 @@ struct _Palette {
GtkWidget *color_area; GtkWidget *color_area;
GtkWidget *color_name; GtkWidget *color_name;
GtkWidget *palette_ops; GtkWidget *palette_ops;
GtkWidget *clist;
GdkGC *gc; GdkGC *gc;
GtkAdjustment *sbar_data; GtkAdjustment *sbar_data;
PaletteEntriesP entries; PaletteEntriesP entries;
@ -111,8 +110,6 @@ static int num_palette_entries = 0;
static unsigned char foreground[3] = { 0, 0, 0 }; static unsigned char foreground[3] = { 0, 0, 0 };
static unsigned char background[3] = { 255, 255, 255 }; static unsigned char background[3] = { 255, 255, 255 };
static PaletteEntriesP p_entries = NULL;
/* Color select dialog */ /* Color select dialog */
/* static ColorSelectP color_select = NULL; /* static ColorSelectP color_select = NULL;
static int color_select_active = 0; */ static int color_select_active = 0; */
@ -149,13 +146,11 @@ palettes_free ()
void void
palette_create () palette_create ()
{ {
/* why isnt this stuff in the Palette struct? */
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *sbar; GtkWidget *sbar;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *options_box; GtkWidget *options_box;
GtkWidget *clist_box;
GtkWidget *arrow_hbox; GtkWidget *arrow_hbox;
GtkWidget *label; GtkWidget *label;
GtkWidget *arrow; GtkWidget *arrow;
@ -172,7 +167,7 @@ palette_create ()
palette->color_select = NULL; palette->color_select = NULL;
palette->color_select_active = 0; palette->color_select_active = 0;
palette->scroll_offset = 0; palette->scroll_offset = 0;
palette->gc = NULL;\ palette->gc = NULL;
palette->updating = FALSE; palette->updating = FALSE;
/* The shell and main vbox */ /* The shell and main vbox */
@ -194,10 +189,6 @@ palette_create ()
options_box = gtk_hbox_new (FALSE, 1); options_box = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0);
/* the clist box */
clist_box = gtk_hbox_new(FALSE, 1);
gtk_box_pack_start(GTK_BOX(vbox), clist_box, FALSE, FALSE, 0);
/* The popup menu -- palette_ops */ /* The popup menu -- palette_ops */
for (i = 0; palette_ops[i].label; i++) for (i = 0; palette_ops[i].label; i++)
palette_ops[i].user_data = palette; palette_ops[i].user_data = palette;
@ -225,28 +216,11 @@ palette_create ()
gtk_widget_show (menu_bar_item); gtk_widget_show (menu_bar_item);
gtk_widget_show (menu_bar); gtk_widget_show (menu_bar);
/* the clist */
palette->clist = gtk_clist_new(1); /* one column */
/* dont forget the callback */
/* It isn't necessary to shadow the border, but it looks nice :) */
gtk_clist_set_border(GTK_CLIST(palette->clist), GTK_SHADOW_OUT);
gtk_clist_set_column_width (GTK_CLIST(palette->clist), 0, 100);
/* slap the clist in place of the option menu for testing */
gtk_box_pack_start (GTK_BOX (clist_box), palette->clist, TRUE, TRUE, 0);
gtk_widget_show(palette->clist);
gtk_signal_connect(GTK_OBJECT(palette->clist), "select_row",
GTK_SIGNAL_FUNC(palette_entries_set_callback),
(gpointer) p_entries);
/* The option menu */ /* The option menu */
/* slap both of them into that box for now... */ palette->option_menu = gtk_option_menu_new ();
/* palette->option_menu = gtk_option_menu_new (); */ gtk_box_pack_start (GTK_BOX (options_box), palette->option_menu, TRUE, TRUE, 0);
/* gtk_box_pack_start (GTK_BOX (options_box), palette->option_menu, TRUE, TRUE, 0); */ gtk_widget_show (palette->option_menu);
/* gtk_widget_show (palette->option_menu); */ gtk_widget_show (options_box);
/* gtk_widget_show (options_box); */
gtk_widget_show(clist_box);
/* The active color name */ /* The active color name */
palette->color_name = gtk_entry_new (); palette->color_name = gtk_entry_new ();
@ -468,7 +442,7 @@ palette_create_palette_menu (PaletteP palette,
{ {
GtkWidget *menu_item; GtkWidget *menu_item;
GSList *list; GSList *list;
/* PaletteEntriesP p_entries = NULL; */ PaletteEntriesP p_entries = NULL;
PaletteEntriesP found_entries = NULL; PaletteEntriesP found_entries = NULL;
int i = 0; int i = 0;
int default_index = -1; int default_index = -1;
@ -494,18 +468,12 @@ palette_create_palette_menu (PaletteP palette,
default_index = i; default_index = i;
} }
/* add each palette to the clist */ menu_item = gtk_menu_item_new_with_label (p_entries->name);
/* casting? */ gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
gtk_clist_append( (GtkCList*)(palette->clist), &p_entries->name); (GtkSignalFunc) palette_entries_set_callback,
(gpointer) p_entries);
gtk_container_add (GTK_CONTAINER (palette->menu), menu_item);
gtk_widget_show (menu_item);
/* menu_item = gtk_menu_item_new_with_label (p_entries->name); */
/* gtk_signal_connect (GTK_OBJECT (menu_item), "activate", */
/* (GtkSignalFunc) palette_entries_set_callback, */
/* (gpointer) p_entries); */
/* gtk_container_add (GTK_CONTAINER (palette->menu), menu_item); */
/* gtk_widget_show (menu_item); */
i++; i++;
} }

56
app/widgets/gimppaletteeditor.c
View File

@ -59,7 +59,6 @@ struct _Palette {
GtkWidget *color_area; GtkWidget *color_area;
GtkWidget *color_name; GtkWidget *color_name;
GtkWidget *palette_ops; GtkWidget *palette_ops;
GtkWidget *clist;
GdkGC *gc; GdkGC *gc;
GtkAdjustment *sbar_data; GtkAdjustment *sbar_data;
PaletteEntriesP entries; PaletteEntriesP entries;
@ -111,8 +110,6 @@ static int num_palette_entries = 0;
static unsigned char foreground[3] = { 0, 0, 0 }; static unsigned char foreground[3] = { 0, 0, 0 };
static unsigned char background[3] = { 255, 255, 255 }; static unsigned char background[3] = { 255, 255, 255 };
static PaletteEntriesP p_entries = NULL;
/* Color select dialog */ /* Color select dialog */
/* static ColorSelectP color_select = NULL; /* static ColorSelectP color_select = NULL;
static int color_select_active = 0; */ static int color_select_active = 0; */
@ -149,13 +146,11 @@ palettes_free ()
void void
palette_create () palette_create ()
{ {
/* why isnt this stuff in the Palette struct? */
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *sbar; GtkWidget *sbar;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *options_box; GtkWidget *options_box;
GtkWidget *clist_box;
GtkWidget *arrow_hbox; GtkWidget *arrow_hbox;
GtkWidget *label; GtkWidget *label;
GtkWidget *arrow; GtkWidget *arrow;
@ -172,7 +167,7 @@ palette_create ()
palette->color_select = NULL; palette->color_select = NULL;
palette->color_select_active = 0; palette->color_select_active = 0;
palette->scroll_offset = 0; palette->scroll_offset = 0;
palette->gc = NULL;\ palette->gc = NULL;
palette->updating = FALSE; palette->updating = FALSE;
/* The shell and main vbox */ /* The shell and main vbox */
@ -194,10 +189,6 @@ palette_create ()
options_box = gtk_hbox_new (FALSE, 1); options_box = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), options_box, FALSE, FALSE, 0);
/* the clist box */
clist_box = gtk_hbox_new(FALSE, 1);
gtk_box_pack_start(GTK_BOX(vbox), clist_box, FALSE, FALSE, 0);
/* The popup menu -- palette_ops */ /* The popup menu -- palette_ops */
for (i = 0; palette_ops[i].label; i++) for (i = 0; palette_ops[i].label; i++)
palette_ops[i].user_data = palette; palette_ops[i].user_data = palette;
@ -225,28 +216,11 @@ palette_create ()
gtk_widget_show (menu_bar_item); gtk_widget_show (menu_bar_item);
gtk_widget_show (menu_bar); gtk_widget_show (menu_bar);
/* the clist */
palette->clist = gtk_clist_new(1); /* one column */
/* dont forget the callback */
/* It isn't necessary to shadow the border, but it looks nice :) */
gtk_clist_set_border(GTK_CLIST(palette->clist), GTK_SHADOW_OUT);
gtk_clist_set_column_width (GTK_CLIST(palette->clist), 0, 100);
/* slap the clist in place of the option menu for testing */
gtk_box_pack_start (GTK_BOX (clist_box), palette->clist, TRUE, TRUE, 0);
gtk_widget_show(palette->clist);
gtk_signal_connect(GTK_OBJECT(palette->clist), "select_row",
GTK_SIGNAL_FUNC(palette_entries_set_callback),
(gpointer) p_entries);
/* The option menu */ /* The option menu */
/* slap both of them into that box for now... */ palette->option_menu = gtk_option_menu_new ();
/* palette->option_menu = gtk_option_menu_new (); */ gtk_box_pack_start (GTK_BOX (options_box), palette->option_menu, TRUE, TRUE, 0);
/* gtk_box_pack_start (GTK_BOX (options_box), palette->option_menu, TRUE, TRUE, 0); */ gtk_widget_show (palette->option_menu);
/* gtk_widget_show (palette->option_menu); */ gtk_widget_show (options_box);
/* gtk_widget_show (options_box); */
gtk_widget_show(clist_box);
/* The active color name */ /* The active color name */
palette->color_name = gtk_entry_new (); palette->color_name = gtk_entry_new ();
@ -468,7 +442,7 @@ palette_create_palette_menu (PaletteP palette,
{ {
GtkWidget *menu_item; GtkWidget *menu_item;
GSList *list; GSList *list;
/* PaletteEntriesP p_entries = NULL; */ PaletteEntriesP p_entries = NULL;
PaletteEntriesP found_entries = NULL; PaletteEntriesP found_entries = NULL;
int i = 0; int i = 0;
int default_index = -1; int default_index = -1;
@ -494,18 +468,12 @@ palette_create_palette_menu (PaletteP palette,
default_index = i; default_index = i;
} }
/* add each palette to the clist */ menu_item = gtk_menu_item_new_with_label (p_entries->name);
/* casting? */ gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
gtk_clist_append( (GtkCList*)(palette->clist), &p_entries->name); (GtkSignalFunc) palette_entries_set_callback,
(gpointer) p_entries);
gtk_container_add (GTK_CONTAINER (palette->menu), menu_item);
gtk_widget_show (menu_item);
/* menu_item = gtk_menu_item_new_with_label (p_entries->name); */
/* gtk_signal_connect (GTK_OBJECT (menu_item), "activate", */
/* (GtkSignalFunc) palette_entries_set_callback, */
/* (gpointer) p_entries); */
/* gtk_container_add (GTK_CONTAINER (palette->menu), menu_item); */
/* gtk_widget_show (menu_item); */
i++; i++;
} }