callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpwidgets/gimpmemsizeentry.c ported to GimpIntComboBox.

Browse Source 
2004-04-20  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpmemsizeentry.c
	* modules/cdisplay_proof.c: ported to GimpIntComboBox.

	* libgimpwidgets/gimpwidgets.[ch]: declared the gimp option_menu
	API as deprecated and removed the code here.

	* libgimpwidgets/Makefile.am
	* libgimpwidgets/gimpoldwidgets.[ch]: new files with deprecated
	code, guarded with #ifndef GIMP_DISABLE_DEPRECATED ... #endif.

	* libgimpwidgets/gimpintcombobox.h: added G_BEGIN_DECLS, G_END_DECLS.

	* configure.in (CPP_FLAGS): added -DGIMP_DISABLE_DEPRECATED.

	* app/widgets/gimpwidgets-constructors.c: added a #warning and
	#undef GIMP_DISABLE_DEPRECATED. The paint mode menu is the last
	remaining user of gimp_int_option_menu_new().
This commit is contained in:
Sven Neumann
2004-04-20 14:37:12 +00:00
committed by Sven Neumann
parent c8efb90364
commit a0e845c8a9
16 changed files with 862 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2004-04-20 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpmemsizeentry.c
* modules/cdisplay_proof.c: ported to GimpIntComboBox.
* libgimpwidgets/gimpwidgets.[ch]: declared the gimp option_menu
API as deprecated and removed the code here.
* libgimpwidgets/Makefile.am
* libgimpwidgets/gimpoldwidgets.[ch]: new files with deprecated
code, guarded with #ifndef GIMP_DISABLE_DEPRECATED ... #endif.
* libgimpwidgets/gimpintcombobox.h: added G_BEGIN_DECLS, G_END_DECLS.
* configure.in (CPP_FLAGS): added -DGIMP_DISABLE_DEPRECATED.
* app/widgets/gimpwidgets-constructors.c: added a #warning and
#undef GIMP_DISABLE_DEPRECATED. The paint mode menu is the last
remaining user of gimp_int_option_menu_new().
2004-04-20 Michael Natterer <mitch@gimp.org>
* app/gui/convert-dialog.[ch]: renamed convert_to_indexed()

5
app/widgets/gimpwidgets-constructors.c
View File

@ -20,6 +20,11 @@
#include <gtk/gtk.h>
#ifdef __GNUC__
#warning GIMP_DISABLE_DEPRECATED
#endif
#undef GIMP_DISABLE_DEPRECATED
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"

7
configure.in
View File

@ -1406,6 +1406,12 @@ GIMP_MKENUMS="\$(top_srcdir)/tools/gimp-mkenums"
AC_SUBST(GIMP_MKENUMS)
#############################
# Disable deprecated GIMP API
#############################
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED"
####################################################
# Default to disable deprecated GTK+ stuff for 2.2.x
####################################################
@ -1417,6 +1423,7 @@ fi
############################
# Require multihead safe API
############################
CPPFLAGS="${CPPFLAGS} -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"

7
devel-docs/ChangeLog
View File

@ -1,3 +1,10 @@
2004-04-20 Sven Neumann <sven@gimp.org>
* libgimpwidgets/libgimpwidgets-docs.sgml
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/tmpl/gimpoldwidgets.sgml
* libgimpwidgets/tmpl/gimpwidgets.sgml
2004-04-20 Sven Neumann <sven@gimp.org>
* libgimpwidgets/libgimpwidgets-docs.sgml

5
devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
View File

@ -59,4 +59,9 @@
<xi:include href="xml/gimpwidgets.xml" />
</part>
<part id="libgimpwidgets-deprecated">
<title>Deprecated API</title>
<xi:include href="xml/gimpoldwidgets.xml" />
</part>
</book>

24
devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
View File

@ -514,15 +514,6 @@ GIMP_STOCK_PATTERN
<SECTION>
<FILE>gimpwidgets</FILE>
<TITLE>GimpWidgets</TITLE>
gimp_option_menu_new
gimp_option_menu_new2
gimp_option_menu_set_history
gimp_option_menu_set_sensitive
GimpOptionMenuSensitivityCallback
gimp_int_option_menu_new
gimp_int_option_menu_set_history
gimp_int_option_menu_set_sensitive
GimpIntOptionMenuSensitivityCallback
gimp_radio_group_new
gimp_radio_group_new2
gimp_radio_group_set_active
@ -547,7 +538,6 @@ gimp_pixmap_button_new
gimp_toggle_button_sensitive_update
gimp_toggle_button_update
gimp_radio_button_update
gimp_menu_item_update
gimp_int_adjustment_update
gimp_uint_adjustment_update
gimp_float_adjustment_update
@ -683,3 +673,17 @@ GIMP_PICK_BUTTON_CLASS
GIMP_IS_PICK_BUTTON_CLASS
GIMP_PICK_BUTTON_GET_CLASS
</SECTION>
<SECTION>
<FILE>gimpoldwidgets</FILE>
gimp_int_option_menu_new
gimp_int_option_menu_set_history
GimpIntOptionMenuSensitivityCallback
gimp_int_option_menu_set_sensitive
gimp_option_menu_new
gimp_option_menu_new2
gimp_option_menu_set_history
GimpOptionMenuSensitivityCallback
gimp_option_menu_set_sensitive
gimp_menu_item_update
</SECTION>

121
devel-docs/libgimpwidgets/tmpl/gimpoldwidgets.sgml Normal file
View File

@ -0,0 +1,121 @@
<!-- ##### SECTION Title ##### -->
gimpoldwidgets
<!-- ##### SECTION Short_Description ##### -->
Old API that is still available but declared as deprecated.
<!-- ##### SECTION Long_Description ##### -->
<para>
These functions are not defined if you #define GIMP_DISABLE_DEPRECATED.
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
GimpIntComboBox
</para>
<!-- ##### FUNCTION gimp_int_option_menu_new ##### -->
<para>
</para>
@menu_only:
@menu_item_callback:
@menu_item_callback_data:
@initial:
@Varargs:
@Returns:
<!-- ##### FUNCTION gimp_int_option_menu_set_history ##### -->
<para>
</para>
@option_menu:
@item_data:
<!-- ##### USER_FUNCTION GimpIntOptionMenuSensitivityCallback ##### -->
<para>
</para>
@item_data:
@callback_data:
@Returns:
<!-- ##### FUNCTION gimp_int_option_menu_set_sensitive ##### -->
<para>
</para>
@option_menu:
@callback:
@callback_data:
<!-- ##### FUNCTION gimp_option_menu_new ##### -->
<para>
</para>
@menu_only:
@Varargs:
@Returns:
<!-- ##### FUNCTION gimp_option_menu_new2 ##### -->
<para>
</para>
@menu_only:
@menu_item_callback:
@menu_item_callback_data:
@initial:
@Varargs:
@Returns:
<!-- ##### FUNCTION gimp_option_menu_set_history ##### -->
<para>
</para>
@option_menu:
@item_data:
<!-- ##### USER_FUNCTION GimpOptionMenuSensitivityCallback ##### -->
<para>
</para>
@item_data:
@callback_data:
@Returns:
<!-- ##### FUNCTION gimp_option_menu_set_sensitive ##### -->
<para>
</para>
@option_menu:
@callback:
@callback_data:
<!-- ##### FUNCTION gimp_menu_item_update ##### -->
<para>
</para>
@widget:
@data:

103
devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
View File

@ -15,100 +15,6 @@ helper functions.
</para>
<!-- ##### FUNCTION gimp_option_menu_new ##### -->
<para>
</para>
@menu_only:
@Varargs:
@Returns:
<!-- ##### FUNCTION gimp_option_menu_new2 ##### -->
<para>
</para>
@menu_only:
@menu_item_callback:
@menu_item_callback_data:
@initial:
@Varargs:
@Returns:
<!-- ##### FUNCTION gimp_option_menu_set_history ##### -->
<para>
</para>
@option_menu:
@item_data:
<!-- ##### FUNCTION gimp_option_menu_set_sensitive ##### -->
<para>
</para>
@option_menu:
@callback:
@callback_data:
<!-- ##### USER_FUNCTION GimpOptionMenuSensitivityCallback ##### -->
<para>
</para>
@item_data:
@callback_data:
@Returns:
<!-- ##### FUNCTION gimp_int_option_menu_new ##### -->
<para>
</para>
@menu_only:
@menu_item_callback:
@menu_item_callback_data:
@initial:
@Varargs:
@Returns:
<!-- ##### FUNCTION gimp_int_option_menu_set_history ##### -->
<para>
</para>
@option_menu:
@item_data:
<!-- ##### FUNCTION gimp_int_option_menu_set_sensitive ##### -->
<para>
</para>
@option_menu:
@callback:
@callback_data:
<!-- ##### USER_FUNCTION GimpIntOptionMenuSensitivityCallback ##### -->
<para>
</para>
@item_data:
@callback_data:
@Returns:
<!-- ##### FUNCTION gimp_radio_group_new ##### -->
<para>
@ -387,15 +293,6 @@ Returns the #GimpChainButton which is attached to the #GimpSizeEntry.
@data:
<!-- ##### FUNCTION gimp_menu_item_update ##### -->
<para>
</para>
@widget:
@data:
<!-- ##### FUNCTION gimp_int_adjustment_update ##### -->
<para>

4
libgimpwidgets/Makefile.am
View File

@ -96,6 +96,8 @@ libgimpwidgets_2_0_la_sources = \
gimpintcombobox.h \
gimpmemsizeentry.c \
gimpmemsizeentry.h \
gimpoldwidgets.c \
gimpoldwidgets.h \
gimpoffsetarea.c \
gimpoffsetarea.h \
gimppatheditor.c \
@ -148,7 +150,9 @@ libgimpwidgetsinclude_HEADERS = \
gimpdialog.h \
gimpfileentry.h \
gimphelpui.h \
gimpintcombobox.h \
gimpmemsizeentry.h \
gimpoldwidgets.h \
gimpoffsetarea.h \
gimppatheditor.h \
gimppickbutton.h \

4
libgimpwidgets/gimpintcombobox.h
View File

@ -24,6 +24,8 @@
#include <gtk/gtkcombobox.h>
G_BEGIN_DECLS
#define GIMP_TYPE_INT_COMBO_BOX (gimp_int_combo_box_get_type ())
#define GIMP_INT_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_INT_COMBO_BOX, GimpIntComboBox))
@ -63,4 +65,6 @@ gboolean gimp_int_combo_box_get_active (GimpIntComboBox *combo_box,
gint *value);
G_END_DECLS
#endif /* __GIMP_INT_COMBO_BOX_H__ */

26
libgimpwidgets/gimpmemsizeentry.c
View File

@ -144,8 +144,9 @@ static void
gimp_memsize_entry_unit_callback (GtkWidget *widget,
GimpMemsizeEntry *entry)
{
guint shift = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget),
"gimp-item-data"));
guint shift;
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), (gint *) &shift);
#if _MSC_VER < 1200
# define CAST (gint64)
@ -212,7 +213,8 @@ gimp_memsize_entry_new (guint64 value,
entry->spinbutton = gimp_spin_button_new ((GtkObject **) &entry->adjustment,
CAST (value >> shift),
CAST (lower >> shift),
CAST (upper >> shift), 1, 8, 0, 1, 0);
CAST (upper >> shift),
1, 8, 0, 1, 0);
#undef CAST
@ -227,15 +229,17 @@ gimp_memsize_entry_new (guint64 value,
G_CALLBACK (gimp_memsize_entry_adj_callback),
entry);
entry->menu =
gimp_int_option_menu_new (FALSE,
G_CALLBACK (gimp_memsize_entry_unit_callback),
entry, shift,
_("KiloBytes"), 10, NULL,
_("MegaBytes"), 20, NULL,
_("GigaBytes"), 30, NULL,
entry->menu = gimp_int_combo_box_new (_("KiloBytes"), 10,
_("MegaBytes"), 20,
_("GigaBytes"), 30,
NULL);
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (entry->menu), shift);
g_signal_connect (entry->menu, "changed",
G_CALLBACK (gimp_memsize_entry_unit_callback),
entry);
gtk_box_pack_start (GTK_BOX (entry), entry->menu, FALSE, FALSE, 0);
gtk_widget_show (entry->menu);
@ -271,7 +275,7 @@ gimp_memsize_entry_set_value (GimpMemsizeEntry *entry,
entry->shift = shift;
entry->value = value;
gimp_int_option_menu_set_history (GTK_OPTION_MENU (entry->menu), shift);
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (entry->menu), shift);
}
#if _MSC_VER < 1200

533
libgimpwidgets/gimpoldwidgets.c Normal file
View File

@ -0,0 +1,533 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimpoldwidgets.c
* Copyright (C) 2000 Michael Natterer <mitch@gimp.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
#include <gtk/gtk.h>
#include "gimpwidgetstypes.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimpoldwidgets.h"
/*
* Widget Constructors
*/
/**
* gimp_option_menu_new:
* @menu_only: %TRUE if the function should return a #GtkMenu only.
* @...: A %NULL-terminated @va_list describing the menu items.
*
* Convenience function to create a #GtkOptionMenu or a #GtkMenu.
*
* Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only).
**/
GtkWidget *
gimp_option_menu_new (gboolean menu_only,
/* specify menu items as va_list:
* const gchar *label,
* GCallback callback,
* gpointer callback_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
* gboolean active
*/
...)
{
GtkWidget *menu;
GtkWidget *menuitem;
/* menu item variables */
const gchar *label;
GCallback callback;
gpointer callback_data;
gpointer item_data;
GtkWidget **widget_ptr;
gboolean active;
va_list args;
gint i;
gint initial_index;
menu = gtk_menu_new ();
/* create the menu items */
initial_index = 0;
va_start (args, menu_only);
label = va_arg (args, const gchar *);
for (i = 0; label; i++)
{
callback = va_arg (args, GCallback);
callback_data = va_arg (args, gpointer);
item_data = va_arg (args, gpointer);
widget_ptr = va_arg (args, GtkWidget **);
active = va_arg (args, gboolean);
if (strcmp (label, "---"))
{
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (menuitem, "activate",
callback,
callback_data);
if (item_data)
{
g_object_set_data (G_OBJECT (menuitem), "gimp-item-data",
item_data);
/* backward compat */
g_object_set_data (G_OBJECT (menuitem), "user_data", item_data);
}
}
else
{
menuitem = gtk_menu_item_new ();
gtk_widget_set_sensitive (menuitem, FALSE);
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (widget_ptr)
*widget_ptr = menuitem;
gtk_widget_show (menuitem);
/* remember the initial menu item */
if (active)
initial_index = i;
label = va_arg (args, const gchar *);
}
va_end (args);
if (! menu_only)
{
GtkWidget *optionmenu;
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
/* select the initial menu item */
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index);
return optionmenu;
}
return menu;
}
/**
* gimp_option_menu_new2:
* @menu_only: %TRUE if the function should return a #GtkMenu only.
* @menu_item_callback: The callback each menu item's "activate" signal will
* be connected with.
* @menu_item_callback_data:
* The data which will be passed to g_signal_connect().
* @initial: The @item_data of the initially selected menu item.
* @...: A %NULL-terminated @va_list describing the menu items.
*
* Convenience function to create a #GtkOptionMenu or a #GtkMenu.
*
* Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only).
**/
GtkWidget *
gimp_option_menu_new2 (gboolean menu_only,
GCallback menu_item_callback,
gpointer callback_data,
gpointer initial, /* item_data */
/* specify menu items as va_list:
* const gchar *label,
* gpointer item_data,
* GtkWidget **widget_ptr,
*/
...)
{
GtkWidget *menu;
GtkWidget *menuitem;
/* menu item variables */
const gchar *label;
gpointer item_data;
GtkWidget **widget_ptr;
va_list args;
gint i;
gint initial_index;
menu = gtk_menu_new ();
/* create the menu items */
initial_index = 0;
va_start (args, initial);
label = va_arg (args, const gchar *);
for (i = 0; label; i++)
{
item_data = va_arg (args, gpointer);
widget_ptr = va_arg (args, GtkWidget **);
if (strcmp (label, "---"))
{
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (menuitem, "activate",
menu_item_callback,
callback_data);
if (item_data)
{
g_object_set_data (G_OBJECT (menuitem), "gimp-item-data",
item_data);
/* backward compat */
g_object_set_data (G_OBJECT (menuitem), "user_data", item_data);
}
}
else
{
menuitem = gtk_menu_item_new ();
gtk_widget_set_sensitive (menuitem, FALSE);
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (widget_ptr)
*widget_ptr = menuitem;
gtk_widget_show (menuitem);
/* remember the initial menu item */
if (item_data == initial)
initial_index = i;
label = va_arg (args, const gchar *);
}
va_end (args);
if (! menu_only)
{
GtkWidget *optionmenu;
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
/* select the initial menu item */
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index);
return optionmenu;
}
return menu;
}
/**
* gimp_int_option_menu_new:
* @menu_only: %TRUE if the function should return a #GtkMenu only.
* @menu_item_callback: The callback each menu item's "activate" signal will
* be connected with.
* @menu_item_callback_data:
* The data which will be passed to g_signal_connect().
* @initial: The @item_data of the initially selected menu item.
* @...: A %NULL-terminated @va_list describing the menu items.
*
* Convenience function to create a #GtkOptionMenu or a #GtkMenu. This
* function does the same thing as the deprecated function
* gimp_option_menu_new2(), but it takes integers as @item_data
* instead of pointers, since that is a very common case (mapping an
* enum to a menu).
*
* Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only).
**/
GtkWidget *
gimp_int_option_menu_new (gboolean menu_only,
GCallback menu_item_callback,
gpointer callback_data,
gint initial, /* item_data */
/* specify menu items as va_list:
* const gchar *label,
* gint item_data,
* GtkWidget **widget_ptr,
*/
...)
{
GtkWidget *menu;
GtkWidget *menuitem;
/* menu item variables */
const gchar *label;
gint item_data;
gpointer item_ptr;
GtkWidget **widget_ptr;
va_list args;
gint i;
gint initial_index;
menu = gtk_menu_new ();
/* create the menu items */
initial_index = 0;
va_start (args, initial);
label = va_arg (args, const gchar *);
for (i = 0; label; i++)
{
item_data = va_arg (args, gint);
widget_ptr = va_arg (args, GtkWidget **);
item_ptr = GINT_TO_POINTER (item_data);
if (strcmp (label, "---"))
{
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (menuitem, "activate",
menu_item_callback,
callback_data);
if (item_data)
{
g_object_set_data (G_OBJECT (menuitem), "gimp-item-data",
item_ptr);
/* backward compat */
g_object_set_data (G_OBJECT (menuitem), "user_data", item_ptr);
}
}
else
{
menuitem = gtk_menu_item_new ();
gtk_widget_set_sensitive (menuitem, FALSE);
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (widget_ptr)
*widget_ptr = menuitem;
gtk_widget_show (menuitem);
/* remember the initial menu item */
if (item_data == initial)
initial_index = i;
label = va_arg (args, const gchar *);
}
va_end (args);
if (! menu_only)
{
GtkWidget *optionmenu;
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
/* select the initial menu item */
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index);
return optionmenu;
}
return menu;
}
/**
* gimp_option_menu_set_history:
* @option_menu: A #GtkOptionMenu as returned by gimp_option_menu_new() or
* gimp_option_menu_new2().
* @item_data: The @item_data of the menu item you want to select.
*
* Iterates over all entries in a #GtkOptionMenu and selects the one
* with the matching @item_data. Probably only makes sense to use with
* a #GtkOptionMenu that was created using gimp_option_menu_new() or
* gimp_option_menu_new2().
**/
void
gimp_option_menu_set_history (GtkOptionMenu *option_menu,
gpointer item_data)
{
GtkWidget *menu_item;
GList *list;
gint history = 0;
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
for (list = GTK_MENU_SHELL (option_menu->menu)->children;
list;
list = g_list_next (list))
{
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child) &&
g_object_get_data (G_OBJECT (menu_item),
"gimp-item-data") == item_data)
{
break;
}
history++;
}
if (list)
gtk_option_menu_set_history (option_menu, history);
}
/**
* gimp_int_option_menu_set_history:
* @option_menu: A #GtkOptionMenu as returned by gimp_int_option_menu_new().
* @item_data: The @item_data of the menu item you want to select.
*
* Iterates over all entries in a #GtkOptionMenu and selects the one with the
* matching @item_data. Probably only makes sense to use with a #GtkOptionMenu
* that was created using gimp_int_option_menu_new(). This function does the
* same thing as gimp_option_menu_set_history(), but takes integers as
* @item_data instead of pointers.
**/
void
gimp_int_option_menu_set_history (GtkOptionMenu *option_menu,
gint item_data)
{
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
gimp_option_menu_set_history (option_menu, GINT_TO_POINTER (item_data));
}
/**
* gimp_option_menu_set_sensitive:
* @option_menu: a #GtkOptionMenu as returned by gimp_option_menu_new() or
* gimp_option_menu_new2().
* @callback: a function called for each item in the menu to determine the
* the sensitivity state.
* @callback_data: data to pass to the @callback function.
*
* Calls the given @callback for each item in the menu and passes it the
* item_data and the @callback_data. The menu item's sensitivity is set
* according to the return value of this function.
**/
void
gimp_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpOptionMenuSensitivityCallback callback,
gpointer callback_data)
{
GtkWidget *menu_item;
GList *list;
gpointer item_data;
gboolean sensitive;
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
g_return_if_fail (callback != NULL);
for (list = GTK_MENU_SHELL (option_menu->menu)->children;
list;
list = g_list_next (list))
{
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child))
{
item_data = g_object_get_data (G_OBJECT (menu_item),
"gimp-item-data");
sensitive = callback (item_data, callback_data);
gtk_widget_set_sensitive (menu_item, sensitive);
}
}
}
/**
* gimp_int_option_menu_set_sensitive:
* @option_menu: a #GtkOptionMenu as returned by gimp_option_menu_new() or
* gimp_option_menu_new2().
* @callback: a function called for each item in the menu to determine the
* the sensitivity state.
* @callback_data: data to pass to the @callback function.
*
* Calls the given @callback for each item in the menu and passes it the
* item_data and the @callback_data. The menu item's sensitivity is set
* according to the return value of this function. This function does the
* same thing as gimp_option_menu_set_sensitive(), but takes integers as
* @item_data instead of pointers.
**/
void
gimp_int_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpIntOptionMenuSensitivityCallback callback,
gpointer callback_data)
{
GtkWidget *menu_item;
GList *list;
gint item_data;
gboolean sensitive;
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
g_return_if_fail (callback != NULL);
for (list = GTK_MENU_SHELL (option_menu->menu)->children;
list;
list = g_list_next (list))
{
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child))
{
item_data = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item),
"gimp-item-data"));
sensitive = callback (item_data, callback_data);
gtk_widget_set_sensitive (menu_item, sensitive);
}
}
}
/**
* gimp_menu_item_update:
* @widget: A #GtkMenuItem.
* @data: A pointer to a #gint variable which will store the value of
* GPOINTER_TO_INT (g_object_get_data (@widget, "gimp-item-data")).
**/
void
gimp_menu_item_update (GtkWidget *widget,
gpointer data)
{
gint *item_val;
item_val = (gint *) data;
*item_val = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-item-data"));
}

105
libgimpwidgets/gimpoldwidgets.h Normal file
View File

@ -0,0 +1,105 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimpoldwidgets.h
* Copyright (C) 2000 Michael Natterer <mitch@gimp.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_OLD_WIDGETS_H__
#define __GIMP_OLD_WIDGETS_H__
/* These functions are deprecated and should not be used in newly
* written code.
*/
#ifndef GIMP_DISABLE_DEPRECATED
G_BEGIN_DECLS
/*
* Widget Constructors
*/
GtkWidget * gimp_int_option_menu_new (gboolean menu_only,
GCallback menu_item_callback,
gpointer menu_item_callback_data,
gint initial, /* item_data */
/* specify menu items as va_list:
* gchar *label,
* gint item_data,
* GtkWidget **widget_ptr,
*/
...);
void gimp_int_option_menu_set_history (GtkOptionMenu *option_menu,
gint item_data);
typedef gboolean (*GimpIntOptionMenuSensitivityCallback) (gint item_data,
gpointer callback_data);
void gimp_int_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpIntOptionMenuSensitivityCallback callback,
gpointer callback_data);
GtkWidget * gimp_option_menu_new (gboolean menu_only,
/* specify menu items as va_list:
* gchar *label,
* GCallback callback,
* gpointer callback_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
* gboolean active
*/
...);
GtkWidget * gimp_option_menu_new2 (gboolean menu_only,
GCallback menu_item_callback,
gpointer menu_item_callback_data,
gpointer initial, /* item_data */
/* specify menu items as va_list:
* gchar *label,
* gpointer item_data,
* GtkWidget **widget_ptr,
*/
...);
void gimp_option_menu_set_history (GtkOptionMenu *option_menu,
gpointer item_data);
typedef gboolean (*GimpOptionMenuSensitivityCallback) (gpointer item_data,
gpointer callback_data);
void gimp_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpOptionMenuSensitivityCallback callback,
gpointer callback_data);
void gimp_menu_item_update (GtkWidget *widget,
gpointer data);
G_END_DECLS
#endif /* GIMP_DISABLE_DEPRECATED */
#endif /* __GIMP_OLD_WIDGETS_H__ */

501
libgimpwidgets/gimpwidgets.c
View File

@ -22,8 +22,6 @@
#include "config.h"
#include <string.h>
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
@ -41,487 +39,6 @@
#include "libgimp/libgimp-intl.h"
/*
* Widget Constructors
*/
/**
* gimp_option_menu_new:
* @menu_only: %TRUE if the function should return a #GtkMenu only.
* @...: A %NULL-terminated @va_list describing the menu items.
*
* Convenience function to create a #GtkOptionMenu or a #GtkMenu.
*
* Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only).
**/
GtkWidget *
gimp_option_menu_new (gboolean menu_only,
/* specify menu items as va_list:
* const gchar *label,
* GCallback callback,
* gpointer callback_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
* gboolean active
*/
...)
{
GtkWidget *menu;
GtkWidget *menuitem;
/* menu item variables */
const gchar *label;
GCallback callback;
gpointer callback_data;
gpointer item_data;
GtkWidget **widget_ptr;
gboolean active;
va_list args;
gint i;
gint initial_index;
menu = gtk_menu_new ();
/* create the menu items */
initial_index = 0;
va_start (args, menu_only);
label = va_arg (args, const gchar *);
for (i = 0; label; i++)
{
callback = va_arg (args, GCallback);
callback_data = va_arg (args, gpointer);
item_data = va_arg (args, gpointer);
widget_ptr = va_arg (args, GtkWidget **);
active = va_arg (args, gboolean);
if (strcmp (label, "---"))
{
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (menuitem, "activate",
callback,
callback_data);
if (item_data)
{
g_object_set_data (G_OBJECT (menuitem), "gimp-item-data",
item_data);
/* backward compat */
g_object_set_data (G_OBJECT (menuitem), "user_data", item_data);
}
}
else
{
menuitem = gtk_menu_item_new ();
gtk_widget_set_sensitive (menuitem, FALSE);
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (widget_ptr)
*widget_ptr = menuitem;
gtk_widget_show (menuitem);
/* remember the initial menu item */
if (active)
initial_index = i;
label = va_arg (args, const gchar *);
}
va_end (args);
if (! menu_only)
{
GtkWidget *optionmenu;
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
/* select the initial menu item */
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index);
return optionmenu;
}
return menu;
}
/**
* gimp_option_menu_new2:
* @menu_only: %TRUE if the function should return a #GtkMenu only.
* @menu_item_callback: The callback each menu item's "activate" signal will
* be connected with.
* @menu_item_callback_data:
* The data which will be passed to g_signal_connect().
* @initial: The @item_data of the initially selected menu item.
* @...: A %NULL-terminated @va_list describing the menu items.
*
* Convenience function to create a #GtkOptionMenu or a #GtkMenu.
*
* Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only).
**/
GtkWidget *
gimp_option_menu_new2 (gboolean menu_only,
GCallback menu_item_callback,
gpointer callback_data,
gpointer initial, /* item_data */
/* specify menu items as va_list:
* const gchar *label,
* gpointer item_data,
* GtkWidget **widget_ptr,
*/
...)
{
GtkWidget *menu;
GtkWidget *menuitem;
/* menu item variables */
const gchar *label;
gpointer item_data;
GtkWidget **widget_ptr;
va_list args;
gint i;
gint initial_index;
menu = gtk_menu_new ();
/* create the menu items */
initial_index = 0;
va_start (args, initial);
label = va_arg (args, const gchar *);
for (i = 0; label; i++)
{
item_data = va_arg (args, gpointer);
widget_ptr = va_arg (args, GtkWidget **);
if (strcmp (label, "---"))
{
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (menuitem, "activate",
menu_item_callback,
callback_data);
if (item_data)
{
g_object_set_data (G_OBJECT (menuitem), "gimp-item-data",
item_data);
/* backward compat */
g_object_set_data (G_OBJECT (menuitem), "user_data", item_data);
}
}
else
{
menuitem = gtk_menu_item_new ();
gtk_widget_set_sensitive (menuitem, FALSE);
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (widget_ptr)
*widget_ptr = menuitem;
gtk_widget_show (menuitem);
/* remember the initial menu item */
if (item_data == initial)
initial_index = i;
label = va_arg (args, const gchar *);
}
va_end (args);
if (! menu_only)
{
GtkWidget *optionmenu;
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
/* select the initial menu item */
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index);
return optionmenu;
}
return menu;
}
/**
* gimp_int_option_menu_new:
* @menu_only: %TRUE if the function should return a #GtkMenu only.
* @menu_item_callback: The callback each menu item's "activate" signal will
* be connected with.
* @menu_item_callback_data:
* The data which will be passed to g_signal_connect().
* @initial: The @item_data of the initially selected menu item.
* @...: A %NULL-terminated @va_list describing the menu items.
*
* Convenience function to create a #GtkOptionMenu or a #GtkMenu. This
* function does the same thing as the deprecated function
* gimp_option_menu_new2(), but it takes integers as @item_data
* instead of pointers, since that is a very common case (mapping an
* enum to a menu).
*
* Returns: A #GtkOptionMenu or a #GtkMenu (depending on @menu_only).
**/
GtkWidget *
gimp_int_option_menu_new (gboolean menu_only,
GCallback menu_item_callback,
gpointer callback_data,
gint initial, /* item_data */
/* specify menu items as va_list:
* const gchar *label,
* gint item_data,
* GtkWidget **widget_ptr,
*/
...)
{
GtkWidget *menu;
GtkWidget *menuitem;
/* menu item variables */
const gchar *label;
gint item_data;
gpointer item_ptr;
GtkWidget **widget_ptr;
va_list args;
gint i;
gint initial_index;
menu = gtk_menu_new ();
/* create the menu items */
initial_index = 0;
va_start (args, initial);
label = va_arg (args, const gchar *);
for (i = 0; label; i++)
{
item_data = va_arg (args, gint);
widget_ptr = va_arg (args, GtkWidget **);
item_ptr = GINT_TO_POINTER (item_data);
if (strcmp (label, "---"))
{
menuitem = gtk_menu_item_new_with_label (label);
g_signal_connect (menuitem, "activate",
menu_item_callback,
callback_data);
if (item_data)
{
g_object_set_data (G_OBJECT (menuitem), "gimp-item-data",
item_ptr);
/* backward compat */
g_object_set_data (G_OBJECT (menuitem), "user_data", item_ptr);
}
}
else
{
menuitem = gtk_menu_item_new ();
gtk_widget_set_sensitive (menuitem, FALSE);
}
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (widget_ptr)
*widget_ptr = menuitem;
gtk_widget_show (menuitem);
/* remember the initial menu item */
if (item_data == initial)
initial_index = i;
label = va_arg (args, const gchar *);
}
va_end (args);
if (! menu_only)
{
GtkWidget *optionmenu;
optionmenu = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
/* select the initial menu item */
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), initial_index);
return optionmenu;
}
return menu;
}
/**
* gimp_option_menu_set_history:
* @option_menu: A #GtkOptionMenu as returned by gimp_option_menu_new() or
* gimp_option_menu_new2().
* @item_data: The @item_data of the menu item you want to select.
*
* Iterates over all entries in a #GtkOptionMenu and selects the one
* with the matching @item_data. Probably only makes sense to use with
* a #GtkOptionMenu that was created using gimp_option_menu_new() or
* gimp_option_menu_new2().
**/
void
gimp_option_menu_set_history (GtkOptionMenu *option_menu,
gpointer item_data)
{
GtkWidget *menu_item;
GList *list;
gint history = 0;
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
for (list = GTK_MENU_SHELL (option_menu->menu)->children;
list;
list = g_list_next (list))
{
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child) &&
g_object_get_data (G_OBJECT (menu_item),
"gimp-item-data") == item_data)
{
break;
}
history++;
}
if (list)
gtk_option_menu_set_history (option_menu, history);
}
/**
* gimp_int_option_menu_set_history:
* @option_menu: A #GtkOptionMenu as returned by gimp_int_option_menu_new().
* @item_data: The @item_data of the menu item you want to select.
*
* Iterates over all entries in a #GtkOptionMenu and selects the one with the
* matching @item_data. Probably only makes sense to use with a #GtkOptionMenu
* that was created using gimp_int_option_menu_new(). This function does the
* same thing as gimp_option_menu_set_history(), but takes integers as
* @item_data instead of pointers.
**/
void
gimp_int_option_menu_set_history (GtkOptionMenu *option_menu,
gint item_data)
{
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
gimp_option_menu_set_history (option_menu, GINT_TO_POINTER (item_data));
}
/**
* gimp_option_menu_set_sensitive:
* @option_menu: a #GtkOptionMenu as returned by gimp_option_menu_new() or
* gimp_option_menu_new2().
* @callback: a function called for each item in the menu to determine the
* the sensitivity state.
* @callback_data: data to pass to the @callback function.
*
* Calls the given @callback for each item in the menu and passes it the
* item_data and the @callback_data. The menu item's sensitivity is set
* according to the return value of this function.
**/
void
gimp_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpOptionMenuSensitivityCallback callback,
gpointer callback_data)
{
GtkWidget *menu_item;
GList *list;
gpointer item_data;
gboolean sensitive;
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
g_return_if_fail (callback != NULL);
for (list = GTK_MENU_SHELL (option_menu->menu)->children;
list;
list = g_list_next (list))
{
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child))
{
item_data = g_object_get_data (G_OBJECT (menu_item),
"gimp-item-data");
sensitive = callback (item_data, callback_data);
gtk_widget_set_sensitive (menu_item, sensitive);
}
}
}
/**
* gimp_int_option_menu_set_sensitive:
* @option_menu: a #GtkOptionMenu as returned by gimp_option_menu_new() or
* gimp_option_menu_new2().
* @callback: a function called for each item in the menu to determine the
* the sensitivity state.
* @callback_data: data to pass to the @callback function.
*
* Calls the given @callback for each item in the menu and passes it the
* item_data and the @callback_data. The menu item's sensitivity is set
* according to the return value of this function. This function does the
* same thing as gimp_option_menu_set_sensitive(), but takes integers as
* @item_data instead of pointers.
**/
void
gimp_int_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpIntOptionMenuSensitivityCallback callback,
gpointer callback_data)
{
GtkWidget *menu_item;
GList *list;
gint item_data;
gboolean sensitive;
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
g_return_if_fail (callback != NULL);
for (list = GTK_MENU_SHELL (option_menu->menu)->children;
list;
list = g_list_next (list))
{
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child))
{
item_data = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item),
"gimp-item-data"));
sensitive = callback (item_data, callback_data);
gtk_widget_set_sensitive (menu_item, sensitive);
}
}
}
/**
* gimp_radio_group_new:
* @in_frame: %TRUE if you want a #GtkFrame around the radio button group.
@ -1710,24 +1227,6 @@ gimp_radio_button_update (GtkWidget *widget,
gimp_toggle_button_sensitive_update (GTK_TOGGLE_BUTTON (widget));
}
/**
* gimp_menu_item_update:
* @widget: A #GtkMenuItem.
* @data: A pointer to a #gint variable which will store the value of
* GPOINTER_TO_INT (g_object_get_data (@widget, "gimp-item-data")).
**/
void
gimp_menu_item_update (GtkWidget *widget,
gpointer data)
{
gint *item_val;
item_val = (gint *) data;
*item_val = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-item-data"));
}
/**
* gimp_int_adjustment_update:
* @adjustment: A #GtkAdjustment.

63
libgimpwidgets/gimpwidgets.h
View File

@ -52,6 +52,8 @@
#include <libgimpwidgets/gimpstock.h>
#include <libgimpwidgets/gimpunitmenu.h>
#include <libgimpwidgets/gimpoldwidgets.h>
G_BEGIN_DECLS
@ -62,64 +64,6 @@ G_BEGIN_DECLS
* Widget Constructors
*/
GtkWidget * gimp_int_option_menu_new (gboolean menu_only,
GCallback menu_item_callback,
gpointer menu_item_callback_data,
gint initial, /* item_data */
/* specify menu items as va_list:
* gchar *label,
* gint item_data,
* GtkWidget **widget_ptr,
*/
...);
void gimp_int_option_menu_set_history (GtkOptionMenu *option_menu,
gint item_data);
typedef gboolean (*GimpIntOptionMenuSensitivityCallback) (gint item_data,
gpointer callback_data);
void gimp_int_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpIntOptionMenuSensitivityCallback callback,
gpointer callback_data);
GtkWidget * gimp_option_menu_new (gboolean menu_only,
/* specify menu items as va_list:
* gchar *label,
* GCallback callback,
* gpointer callback_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
* gboolean active
*/
...);
GtkWidget * gimp_option_menu_new2 (gboolean menu_only,
GCallback menu_item_callback,
gpointer menu_item_callback_data,
gpointer initial, /* item_data */
/* specify menu items as va_list:
* gchar *label,
* gpointer item_data,
* GtkWidget **widget_ptr,
*/
...);
void gimp_option_menu_set_history (GtkOptionMenu *option_menu,
gpointer item_data);
typedef gboolean (*GimpOptionMenuSensitivityCallback) (gpointer item_data,
gpointer callback_data);
void gimp_option_menu_set_sensitive (GtkOptionMenu *option_menu,
GimpOptionMenuSensitivityCallback callback,
gpointer callback_data);
GtkWidget * gimp_int_radio_group_new (gboolean in_frame,
const gchar *frame_title,
GCallback radio_button_callback,
@ -289,9 +233,6 @@ void gimp_toggle_button_update (GtkWidget *widget,
void gimp_radio_button_update (GtkWidget *widget,
gpointer data);
void gimp_menu_item_update (GtkWidget *widget,
gpointer data);
void gimp_int_adjustment_update (GtkAdjustment *adjustment,
gpointer data);

30
modules/cdisplay_proof.c
View File

@ -57,7 +57,7 @@ struct _CdisplayProof
cmsHTRANSFORM transform;
GtkWidget *table;
GtkWidget *optionmenu;
GtkWidget *combo;
GtkWidget *toggle;
};
@ -311,25 +311,25 @@ cdisplay_proof_configure (GimpColorDisplay *display)
gtk_table_set_col_spacings (GTK_TABLE (proof->table), 4);
gtk_table_set_row_spacings (GTK_TABLE (proof->table), 2);
proof->optionmenu =
gimp_int_option_menu_new (FALSE,
G_CALLBACK (proof_intent_callback),
proof, proof->intent,
_("Perceptual"),
INTENT_PERCEPTUAL, NULL,
proof->combo = gimp_int_combo_box_new (_("Perceptual"),
INTENT_PERCEPTUAL,
_("Relative Colorimetric"),
INTENT_RELATIVE_COLORIMETRIC, NULL,
INTENT_RELATIVE_COLORIMETRIC,
_("Saturation"),
INTENT_SATURATION, NULL,
INTENT_SATURATION,
_("Absolute Colorimetric"),
INTENT_ABSOLUTE_COLORIMETRIC, NULL,
INTENT_ABSOLUTE_COLORIMETRIC,
NULL);
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (proof->combo),
proof->intent);
g_signal_connect (proof->combo, "changed",
G_CALLBACK (proof_intent_callback),
proof);
gimp_table_attach_aligned (GTK_TABLE (proof->table), 0, 0,
_("_Intent:"), 1.0, 0.5,
proof->optionmenu, 1, TRUE);
proof->combo, 1, TRUE);
entry = gimp_file_entry_new (_("Choose an ICC Color Profile"),
proof->filename, FALSE, FALSE);
@ -365,7 +365,7 @@ cdisplay_proof_configure_reset (GimpColorDisplay * display)
if (proof->table)
{
gimp_int_option_menu_set_history (GTK_OPTION_MENU (proof->optionmenu),
gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (proof->combo),
INTENT_PERCEPTUAL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (proof->toggle),
proof->bpc);
@ -419,7 +419,7 @@ static void
proof_intent_callback (GtkWidget *widget,
CdisplayProof *proof)
{
gimp_menu_item_update (widget, &proof->intent);
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &proof->intent);
gimp_color_display_changed (GIMP_COLOR_DISPLAY (proof));
}