Commit 3aa36bbb authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

removed unused function gimp_prop_enum_option_menu_new_with_values() which

2003-01-29  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimppropwidgets.[ch]: removed unused function
	gimp_prop_enum_option_menu_new_with_values() which caused problems
	on some platforms (fixes bug #102514).

	* app/gui/preferences_dialog.c: removed some unused code.
parent 4463cdd0
2003-01-29 Sven Neumann <sven@gimp.org>
* app/widgets/gimppropwidgets.[ch]: removed unused function
gimp_prop_enum_option_menu_new_with_values() which caused problems
on some platforms (fixes bug #102514).
* app/gui/preferences_dialog.c: removed some unused code.
2003-01-29 Michael Natterer <mitch@gimp.org>
 
* app/gui/module-browser.c: pack the button box non-expanding,
......
......@@ -694,35 +694,6 @@ prefs_enum_option_menu_add (GObject *config,
return menu;
}
#if 0
static GtkWidget *
prefs_enum_option_menu_add_with_values (GObject *config,
const gchar *property_name,
const gchar *label,
GtkTable *table,
gint table_row,
gint n_values,
...)
{
GtkWidget *menu;
va_list args;
va_start (args, n_values);
menu = gimp_prop_enum_option_menu_new_valist (config, property_name,
n_values, args);
va_end (args);
if (menu)
gimp_table_attach_aligned (table, 0, table_row,
label, 1.0, 0.5,
menu, 1, TRUE);
return menu;
}
#endif
static GtkWidget *
prefs_boolean_option_menu_add (GObject *config,
const gchar *property_name,
......
......@@ -694,35 +694,6 @@ prefs_enum_option_menu_add (GObject *config,
return menu;
}
#if 0
static GtkWidget *
prefs_enum_option_menu_add_with_values (GObject *config,
const gchar *property_name,
const gchar *label,
GtkTable *table,
gint table_row,
gint n_values,
...)
{
GtkWidget *menu;
va_list args;
va_start (args, n_values);
menu = gimp_prop_enum_option_menu_new_valist (config, property_name,
n_values, args);
va_end (args);
if (menu)
gimp_table_attach_aligned (table, 0, table_row,
label, 1.0, 0.5,
menu, 1, TRUE);
return menu;
}
#endif
static GtkWidget *
prefs_boolean_option_menu_add (GObject *config,
const gchar *property_name,
......
......@@ -151,12 +151,6 @@ gimp_prop_check_button_notify (GObject *config,
/* option menus */
/******************/
static GtkWidget * gimp_prop_enum_option_menu_new_full (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum,
gint n_values,
va_list args);
static void gimp_prop_option_menu_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_option_menu_notify (GObject *config,
......@@ -207,50 +201,6 @@ gimp_prop_enum_option_menu_new (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum)
{
return gimp_prop_enum_option_menu_new_full (config, property_name,
minimum, maximum,
0, NULL);
}
GtkWidget *
gimp_prop_enum_option_menu_new_with_values (GObject *config,
const gchar *property_name,
gint n_values,
...)
{
GtkWidget *optionmenu;
va_list args;
va_start (args, n_values);
optionmenu = gimp_prop_enum_option_menu_new_full (config, property_name,
0, 0,
n_values, args);
va_end (args);
return optionmenu;
}
GtkWidget *
gimp_prop_enum_option_menu_new_valist (GObject *config,
const gchar *property_name,
gint n_values,
va_list args)
{
return gimp_prop_enum_option_menu_new_full (config, property_name,
0, 0,
n_values, args);
}
static GtkWidget *
gimp_prop_enum_option_menu_new_full (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum,
gint n_values,
va_list args)
{
GParamSpec *param_spec;
GtkWidget *optionmenu;
......@@ -265,31 +215,20 @@ gimp_prop_enum_option_menu_new_full (GObject *config,
property_name, &value,
NULL);
if (n_values > 0)
if (minimum != maximum)
{
optionmenu =
gimp_enum_option_menu_new_with_values_valist (param_spec->value_type,
G_CALLBACK (gimp_prop_option_menu_callback),
config,
n_values, args);
gimp_enum_option_menu_new_with_range (param_spec->value_type,
minimum, maximum,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
else
{
if (minimum != maximum)
{
optionmenu =
gimp_enum_option_menu_new_with_range (param_spec->value_type,
minimum, maximum,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
else
{
optionmenu =
gimp_enum_option_menu_new (param_spec->value_type,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
optionmenu =
gimp_enum_option_menu_new (param_spec->value_type,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
gimp_option_menu_set_history (GTK_OPTION_MENU (optionmenu),
......
......@@ -40,15 +40,6 @@ GtkWidget * gimp_prop_enum_option_menu_new (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum);
GtkWidget *
gimp_prop_enum_option_menu_new_with_values (GObject *config,
const gchar *property_name,
gint n_values,
...);
GtkWidget * gimp_prop_enum_option_menu_new_valist (GObject *config,
const gchar *property_name,
gint n_values,
va_list args);
/* GParamInt, GParamUInt, GParamLong, GParamULong, GParamDouble */
......
......@@ -151,12 +151,6 @@ gimp_prop_check_button_notify (GObject *config,
/* option menus */
/******************/
static GtkWidget * gimp_prop_enum_option_menu_new_full (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum,
gint n_values,
va_list args);
static void gimp_prop_option_menu_callback (GtkWidget *widget,
GObject *config);
static void gimp_prop_option_menu_notify (GObject *config,
......@@ -207,50 +201,6 @@ gimp_prop_enum_option_menu_new (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum)
{
return gimp_prop_enum_option_menu_new_full (config, property_name,
minimum, maximum,
0, NULL);
}
GtkWidget *
gimp_prop_enum_option_menu_new_with_values (GObject *config,
const gchar *property_name,
gint n_values,
...)
{
GtkWidget *optionmenu;
va_list args;
va_start (args, n_values);
optionmenu = gimp_prop_enum_option_menu_new_full (config, property_name,
0, 0,
n_values, args);
va_end (args);
return optionmenu;
}
GtkWidget *
gimp_prop_enum_option_menu_new_valist (GObject *config,
const gchar *property_name,
gint n_values,
va_list args)
{
return gimp_prop_enum_option_menu_new_full (config, property_name,
0, 0,
n_values, args);
}
static GtkWidget *
gimp_prop_enum_option_menu_new_full (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum,
gint n_values,
va_list args)
{
GParamSpec *param_spec;
GtkWidget *optionmenu;
......@@ -265,31 +215,20 @@ gimp_prop_enum_option_menu_new_full (GObject *config,
property_name, &value,
NULL);
if (n_values > 0)
if (minimum != maximum)
{
optionmenu =
gimp_enum_option_menu_new_with_values_valist (param_spec->value_type,
G_CALLBACK (gimp_prop_option_menu_callback),
config,
n_values, args);
gimp_enum_option_menu_new_with_range (param_spec->value_type,
minimum, maximum,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
else
{
if (minimum != maximum)
{
optionmenu =
gimp_enum_option_menu_new_with_range (param_spec->value_type,
minimum, maximum,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
else
{
optionmenu =
gimp_enum_option_menu_new (param_spec->value_type,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
optionmenu =
gimp_enum_option_menu_new (param_spec->value_type,
G_CALLBACK (gimp_prop_option_menu_callback),
config);
}
gimp_option_menu_set_history (GTK_OPTION_MENU (optionmenu),
......
......@@ -40,15 +40,6 @@ GtkWidget * gimp_prop_enum_option_menu_new (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum);
GtkWidget *
gimp_prop_enum_option_menu_new_with_values (GObject *config,
const gchar *property_name,
gint n_values,
...);
GtkWidget * gimp_prop_enum_option_menu_new_valist (GObject *config,
const gchar *property_name,
gint n_values,
va_list args);
/* GParamInt, GParamUInt, GParamLong, GParamULong, GParamDouble */
......
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