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

use "gimp-item-data" instead of "user_data" as data key when attaching

Browse Source 
2001-11-22  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpwidgets.[ch]: use "gimp-item-data" instead of
	"user_data" as data key when attaching values to radio buttons or
	menu items. (For backward compat, attach "user_data" additionally,
	but don't use it to _get_data()).
	Added gimp_radio_group_set_active() which works like
	gimp_options_menu_set_history() and sets the active item by
	attached "gimp-item-data" value.

	* app/gui/brush-select.c
	* app/gui/file-new-dialog.c
	* app/gui/info-window.c
	* app/gui/preferences-dialog.c
	* app/gui/resolution-calibrate-dialog.c
	* app/tools/gimpbucketfilltool.c
	* app/tools/gimpselectiontool.c
	* app/tools/paint_options.c
	* app/tools/selection_options.c
	* app/widgets/gimplayerlistview.c: removed all kinds of
	"user_data" stuff and evil hacks to find a radio button by the
	value it represents (simply call gimp_radio_group_set_active()).

	* app/tools/gimpdrawtool.c: added a g_return_if_fail().

	* app/tools/gimpfliptool.c: don't set draw_tool_class->draw to NULL,

	* app/tools/gimptransformtool.[ch]: fixed some stuff i broke when
	removing the old "interactive" boolean (there is no
	non-interactive transform tool any more).  Put the info_dialog
	pointer and the old_trans_info array into the GimpTransformTool
	instance. Added gimp_transform_tool_info_dialog_connect(). Don't
	include any subclasses any more.

	* app/tools/gimpperspectivetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c: use
	gimp_transform_tool_info_dialog_connect() to create and connect
	the info dialogs' action_area.
This commit is contained in:
Michael Natterer
2001-11-22 13:01:26 +00:00
committed by Michael Natterer
parent 2a33106bd3
commit a08f3ac001
28 changed files with 418 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
libgimpwidgets/gimpwidgets.h
View File

@ -42,9 +42,7 @@
#include <libgimpwidgets/gimpunitmenu.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
@ -57,8 +55,8 @@ GtkWidget * gimp_option_menu_new (gboolean menu_only,
/* specify menu items as va_list:
* gchar *label,
* GCallback callback,
* gpointer data,
* gpointer user_data,
* gpointer callback_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
* gboolean active
*/
@ -67,19 +65,19 @@ GtkWidget * gimp_option_menu_new (gboolean menu_only,
GtkWidget * gimp_option_menu_new2 (gboolean menu_only,
GCallback menu_item_callback,
gpointer data,
gpointer initial, /* user_data */
gpointer menu_item_callback_data,
gpointer initial, /* item_data */
/* specify menu items as va_list:
* gchar *label,
* gpointer user_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
*/
...);
void gimp_option_menu_set_history (GtkOptionMenu *option_menu,
gpointer user_data);
gpointer item_data);
GtkWidget * gimp_radio_group_new (gboolean in_frame,
const gchar *frame_title,
@ -87,8 +85,8 @@ GtkWidget * gimp_radio_group_new (gboolean in_frame,
/* specify radio buttons as va_list:
* const gchar *label,
* GCallback callback,
* gpointer data,
* gpointer user_data,
* gpointer callback_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
* gboolean active,
*/
@ -98,17 +96,20 @@ GtkWidget * gimp_radio_group_new (gboolean in_frame,
GtkWidget * gimp_radio_group_new2 (gboolean in_frame,
const gchar *frame_title,
GCallback radio_button_callback,
gpointer data,
gpointer initial, /* user_data */
gpointer radio_button_callback_data,
gpointer initial, /* item_data */
/* specify radio buttons as va_list:
* const gchar *label,
* gpointer user_data,
* gpointer item_data,
* GtkWidget **widget_ptr,
*/
...);
void gimp_radio_group_set_active (GtkRadioButton *radio_button,
gpointer item_data);
GtkWidget * gimp_spin_button_new (/* return value: */
GtkObject **adjustment,
@ -122,19 +123,19 @@ GtkWidget * gimp_spin_button_new (/* return value: */
guint digits);
#define GIMP_SCALE_ENTRY_LABEL(adj) \
GTK_LABEL (gtk_object_get_data (GTK_OBJECT(adj), "label"))
GTK_LABEL (g_object_get_data (G_OBJECT (adj), "label"))
#define GIMP_SCALE_ENTRY_SCALE(adj) \
GTK_HSCALE (gtk_object_get_data (GTK_OBJECT(adj), "scale"))
GTK_HSCALE (g_object_get_data (G_OBJECT (adj), "scale"))
#define GIMP_SCALE_ENTRY_SCALE_ADJ(adj) \
gtk_range_get_adjustment \
(GTK_RANGE (gtk_object_get_data (GTK_OBJECT (adj), "scale")))
(GTK_RANGE (g_object_get_data (G_OBJECT (adj), "scale")))
#define GIMP_SCALE_ENTRY_SPINBUTTON(adj) \
GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (adj), "spinbutton"))
GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton"))
#define GIMP_SCALE_ENTRY_SPINBUTTON_ADJ(adj) \
gtk_spin_button_get_adjustment \
(GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (adj), "spinbutton")))
(GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (adj), "spinbutton")))
GtkObject * gimp_scale_entry_new (GtkTable *table,
gint column,
@ -155,14 +156,13 @@ GtkObject * gimp_scale_entry_new (GtkTable *table,
const gchar *help_data);
#define GIMP_RANDOM_SEED_SPINBUTTON(hbox) \
GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT( hbox), "spinbutton"))
GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (hbox), "spinbutton"))
#define GIMP_RANDOM_SEED_SPINBUTTON_ADJ(hbox) \
gtk_spin_button_get_adjustment \
(GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (hbox), "spinbutton")))
(GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (hbox), "spinbutton")))
#define GIMP_RANDOM_SEED_TOGGLEBUTTON(hbox) \
GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (hbox), \
"togglebutton"))
GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (hbox), "togglebutton"))
GtkWidget * gimp_random_seed_new (gint *seed,
gint *use_time,
@ -200,15 +200,12 @@ GtkWidget * gimp_coordinates_new (GimpUnit unit,
gdouble ysize_100 /* % */);
#define GIMP_MEM_SIZE_ENTRY_SPINBUTTON(memsize) \
GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (memsize), \
"spinbutton"))
GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (memsize), "spinbutton"))
#define GIMP_MEM_SIZE_ENTRY_SPINBUTTON_ADJ(memsize) \
gtk_spin_button_get_adjustment \
(GTK_SPIN_BUTTON (gtk_object_get_data (GTK_OBJECT (memsize), \
"spinbutton")))
(GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (memsize), "spinbutton")))
#define GIMP_MEM_SIZE_ENTRY_OPTIONMENU(memsize) \
GTK_OPTION_MENU (gtk_object_get_data (GTK_OBJECT (memsize), \
"optionmenu"))
GTK_OPTION_MENU (g_object_get_data (G_OBJECT (memsize), "optionmenu"))
GtkWidget * gimp_mem_size_entry_new (GtkAdjustment *adjustment);
@ -262,8 +259,6 @@ void gimp_table_attach_aligned (GtkTable *table,
gboolean left_align);
#ifdef __cplusplus
}
#endif /* __cplusplus */
G_END_DECLS
#endif /* __GIMP_WIDGETS_H__ */