pass the GimpItemListView as "data" to the item_factory callbacks, not

2003-01-12  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpitemlistview.c: pass the GimpItemListView as
	"data" to the item_factory callbacks, not just a "Gimp" pointer.

	* app/display/gimpdisplayshell.c: use
	gtk_window_add_accel_group(), not gimp_window_add_accel_group()
	because we now attach the menubar's accel group, which has the
	GimpDisplay as callback data.

	* app/display/gimpdisplayshell-callbacks.c: pass the GimpDisplay
	as "popup_data" to *_item_factory_popup_with_data().

	* app/gui/channels-commands.c
	* app/gui/drawable-commands.c
	* app/gui/layers-commands.c
	* app/gui/vectors-commands.c: changed accordingly.

	* app/widgets/gimpwidgets-utils.[ch]: removed
	gimp_window_[add|remove]_accel_group() and
	gimp_widget_get_callback_context() because they were evil hacks
	which are no longer needed now that all item_factories have proper
	callback data (no just Gimp pointers).
This commit is contained in:
Michael Natterer
2003-01-12 12:35:00 +00:00
committed by Michael Natterer
parent 6098d87148
commit f44500aa69
16 changed files with 139 additions and 260 deletions

View File

@ -26,35 +26,26 @@
typedef gpointer (* GimpGetAccelContextFunc) (gpointer data);
void gimp_message_box (const gchar *message,
GtkCallback callback,
gpointer data);
void gimp_message_box (const gchar *message,
GtkCallback callback,
gpointer data);
void gimp_menu_position (GtkMenu *menu,
gint *x,
gint *y,
guint *button,
guint32 *activate_time);
void gimp_menu_position (GtkMenu *menu,
gint *x,
gint *y,
guint *button,
guint32 *activate_time);
void gimp_window_add_accel_group (GtkWindow *window,
GtkItemFactory *item_factory,
GimpGetAccelContextFunc get_context_func,
gpointer get_context_data);
void gimp_window_remove_accel_group (GtkWindow *window,
GtkItemFactory *item_factory);
void gimp_table_attach_stock (GtkTable *table,
gint column,
gint row,
const gchar *stock_id,
GtkWidget *widget);
gpointer gimp_widget_get_callback_context (GtkWidget *widget);
void gimp_table_attach_stock (GtkTable *table,
gint column,
gint row,
const gchar *stock_id,
GtkWidget *widget);
const gchar * gimp_get_mod_name_shift (void);
const gchar * gimp_get_mod_name_control (void);
const gchar * gimp_get_mod_name_alt (void);
const gchar * gimp_get_mod_separator (void);
const gchar * gimp_get_mod_name_shift (void);
const gchar * gimp_get_mod_name_control (void);
const gchar * gimp_get_mod_name_alt (void);
const gchar * gimp_get_mod_separator (void);
#endif /* __GIMP_WIDGETS_UTILS_H__ */