Commit 1afe7960 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/gui/dialogs-constructors.c silent the compiler.

2004-04-22  Sven Neumann  <sven@gimp.org>

	* app/gui/dialogs-constructors.c
	* app/gui/preferences-dialog.c: silent the compiler.

	* plug-ins/winicon/icodialog.c: simplified by using a
	GimpIntComboBox.
parent 10718425
2004-04-22 Sven Neumann <sven@gimp.org>
* app/gui/dialogs-constructors.c
* app/gui/preferences-dialog.c: silent the compiler.
* plug-ins/winicon/icodialog.c: simplified by using a
GimpIntComboBox.
2004-04-22 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpuimanager.[ch]: remember and ref the created
......
......@@ -189,7 +189,7 @@ dialogs_tool_options_get (GimpDialogFactory *factory,
view = gimp_tool_options_editor_new (context->gimp, factory->menu_factory);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
return dialogs_dockable_new (view,
_("Tool Options"), NULL,
......@@ -209,7 +209,7 @@ dialogs_device_status_get (GimpDialogFactory *factory,
view = gimp_device_status_new (context->gimp);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
return dialogs_dockable_new (view,
_("Devices"), _("Device Status"),
......@@ -229,7 +229,7 @@ dialogs_error_console_get (GimpDialogFactory *factory,
view = gimp_error_console_new (context->gimp, factory->menu_factory);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
return dialogs_dockable_new (view,
_("Errors"), _("Error Console"),
......
......@@ -116,7 +116,7 @@ preferences_dialog_create (Gimp *gimp)
prefs_dialog = prefs_dialog_new (gimp, config_copy);
g_object_add_weak_pointer (G_OBJECT (prefs_dialog),
(gpointer *) &prefs_dialog);
(gpointer) &prefs_dialog);
g_object_set_data (G_OBJECT (prefs_dialog), "gimp", gimp);
......@@ -420,7 +420,7 @@ prefs_input_devices_dialog (GtkWidget *widget,
input_dialog = gtk_input_dialog_new ();
g_object_add_weak_pointer (G_OBJECT (input_dialog),
(gpointer *) &input_dialog);
(gpointer) &input_dialog);
gtk_window_set_transient_for (GTK_WINDOW (input_dialog),
GTK_WINDOW (prefs_dialog));
......
......@@ -189,7 +189,7 @@ dialogs_tool_options_get (GimpDialogFactory *factory,
view = gimp_tool_options_editor_new (context->gimp, factory->menu_factory);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
return dialogs_dockable_new (view,
_("Tool Options"), NULL,
......@@ -209,7 +209,7 @@ dialogs_device_status_get (GimpDialogFactory *factory,
view = gimp_device_status_new (context->gimp);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
return dialogs_dockable_new (view,
_("Devices"), _("Device Status"),
......@@ -229,7 +229,7 @@ dialogs_error_console_get (GimpDialogFactory *factory,
view = gimp_error_console_new (context->gimp, factory->menu_factory);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
g_object_add_weak_pointer (G_OBJECT (view), (gpointer) &view);
return dialogs_dockable_new (view,
_("Errors"), _("Error Console"),
......
......@@ -116,7 +116,7 @@ preferences_dialog_create (Gimp *gimp)
prefs_dialog = prefs_dialog_new (gimp, config_copy);
g_object_add_weak_pointer (G_OBJECT (prefs_dialog),
(gpointer *) &prefs_dialog);
(gpointer) &prefs_dialog);
g_object_set_data (G_OBJECT (prefs_dialog), "gimp", gimp);
......@@ -420,7 +420,7 @@ prefs_input_devices_dialog (GtkWidget *widget,
input_dialog = gtk_input_dialog_new ();
g_object_add_weak_pointer (G_OBJECT (input_dialog),
(gpointer *) &input_dialog);
(gpointer) &input_dialog);
gtk_window_set_transient_for (GTK_WINDOW (input_dialog),
GTK_WINDOW (prefs_dialog));
......
......@@ -186,25 +186,20 @@ ico_create_icon_hbox (GtkWidget *icon_preview,
gtk_widget_show (icon_preview);
gtk_box_pack_start (GTK_BOX (hbox), icon_preview, TRUE, TRUE, 0);
combo = gtk_combo_box_new ();
g_object_set_data (G_OBJECT (hbox), "icon_menu", combo);
gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo);
gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
_("1 bpp, 1-bit alpha, 2-slot palette"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
_("4 bpp, 1-bit alpha, 16-slot palette"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
_("8 bpp, 1-bit alpha, 256-slot palette"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
_("32 bpp, 8-bit alpha, no palette"));
combo = gimp_int_combo_box_new (_("1 bpp, 1-bit alpha, 2-slot palette"), 1,
_("4 bpp, 1-bit alpha, 16-slot palette"), 4,
_("8 bpp, 1-bit alpha, 256-slot palette"), 8,
_("32 bpp, 8-bit alpha, no palette"), 32,
NULL);
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (combo), 32);
g_signal_connect (combo, "changed",
G_CALLBACK (combo_bpp_changed),
hbox);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 3);
g_object_set_data (G_OBJECT (hbox), "icon_menu", combo);
gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
gtk_widget_show (combo);
return hbox;
}
......@@ -380,15 +375,7 @@ combo_bpp_changed (GtkWidget *combo,
gint bpp;
gint *icon_depths;
switch (gtk_combo_box_get_active (GTK_COMBO_BOX (combo)))
{
case 0: bpp = 1; break;
case 1: bpp = 4; break;
case 2: bpp = 8; break;
case 3: bpp = 32; break;
default:
return;
}
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (combo), &bpp);
icon_depths = g_object_get_data (G_OBJECT (dialog), "icon_depths");
if (! icon_depths)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment