[monkey-bubble: 203/753] Use GtkImageMenuItem, not GtkPixmapMenuItem.

[Sven Herzberg <herzi src gnome org>]

commit f0c87c745d63d36741e7dd7aea9a3ac591119049
Author: Martin Baulig <baulig suse de>
Date:   Thu Apr 26 09:22:05 2001 +0000

    Use GtkImageMenuItem, not GtkPixmapMenuItem.
    
    2001-04-26  Martin Baulig  <baulig suse de>
    
    	* gnome-app-helper.c: Use GtkImageMenuItem, not GtkPixmapMenuItem.
    
    	* gtkpixmapmenuitem.[ch]: Removed.

 libgnomeui/ChangeLog           |    6 +
 libgnomeui/Makefile.am         |    2 -
 libgnomeui/gnome-app-helper.c  |   31 ++--
 libgnomeui/gtkpixmapmenuitem.c |  350 ----------------------------------------
 libgnomeui/gtkpixmapmenuitem.h |   85 ----------
 libgnomeui/libgnomeui.h        |    1 -
 6 files changed, 20 insertions(+), 455 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 75b48d5..1816441 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,5 +1,11 @@
 2001-04-26  Martin Baulig  <baulig suse de>
 
+	* gnome-app-helper.c: Use GtkImageMenuItem, not GtkPixmapMenuItem.
+
+	* gtkpixmapmenuitem.[ch]: Removed.
+
+2001-04-26  Martin Baulig  <baulig suse de>
+
 	* gnome-file-saver.[ch]: Removed.
 
 2001-04-26  Martin Baulig  <baulig suse de>
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index e843342..e6ab98f 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -91,7 +91,6 @@ libgnomeui_2_la_SOURCES = \
 	gnometypes.c			\
 	gtk-clock.c			\
 	gtkdial.c			\
-	gtkpixmapmenuitem.c		\
 	gnome-icon-list.c		\
 	gnome-icon-item.c		\
 	gnome-icon-text.c		\
@@ -159,7 +158,6 @@ gnome_headers = \
         gnome-winhints.h		\
 	gtkdial.h			\
 	gtk-clock.h			\
-	gtkpixmapmenuitem.h		\
 	libgnomeui.h			\
 	gnome-vfs-util.h		\
 	gnome-textfu.h			\
diff --git a/libgnomeui/gnome-app-helper.c b/libgnomeui/gnome-app-helper.c
index 4782c1c..7f0442d 100644
--- a/libgnomeui/gnome-app-helper.c
+++ b/libgnomeui/gnome-app-helper.c
@@ -61,7 +61,6 @@
 #include "gnome-pixmap.h"
 #include "gnome-preferences.h"
 #include "gnome-stock.h"
-#include "gtkpixmapmenuitem.h"
 
 extern const gchar *gnome_user_accels_dir;
 
@@ -386,7 +385,7 @@ showing_pixmaps_changed_notify(GConfClient            *client,
 {
         gboolean new_setting = TRUE;
         GtkWidget *w = user_data;
-        GtkPixmapMenuItem *mi = GTK_PIXMAP_MENU_ITEM(w);
+        GtkImageMenuItem *mi = GTK_IMAGE_MENU_ITEM(w);
 	GConfValue *value;
 
 	value = gconf_entry_get_value (entry);
@@ -395,7 +394,7 @@ showing_pixmaps_changed_notify(GConfClient            *client,
                 new_setting = gconf_value_get_bool(value);
         }
 
-        if (new_setting && (mi->pixmap == NULL)) {
+        if (new_setting && (mi->image == NULL)) {
                 GtkWidget *pixmap;
                 GnomeUIPixmapType pixmap_type;
                 gconstpointer pixmap_info;
@@ -409,11 +408,9 @@ showing_pixmaps_changed_notify(GConfClient            *client,
 
                 gtk_widget_show(pixmap);
                 
-                gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM(mi),
-                                                pixmap);
-                
-        } else if (!new_setting && (mi->pixmap != NULL)) {
-                gtk_container_remove(GTK_CONTAINER(mi), mi->pixmap);
+		g_object_set(G_OBJECT(mi), "image", pixmap, NULL);
+        } else if (!new_setting && (mi->image != NULL)) {
+		g_object_set(G_OBJECT(mi), "image", NULL, NULL);
         }
 }
 
@@ -433,13 +430,13 @@ remove_notify_cb(GtkObject *obj, gpointer data)
 }
 
 static void
-setup_pixmap_menu_item(GtkWidget *mi, GnomeUIPixmapType pixmap_type,
-                       gconstpointer pixmap_info)
+setup_image_menu_item(GtkWidget *mi, GnomeUIPixmapType pixmap_type,
+		      gconstpointer pixmap_info)
 {
         guint notify_id;
         GConfClient *conf;
         
-        g_return_if_fail(GTK_IS_PIXMAP_MENU_ITEM(mi));
+        g_return_if_fail(GTK_IS_IMAGE_MENU_ITEM(mi));
 
         gtk_object_set_data(GTK_OBJECT(mi), gnome_app_helper_pixmap_type,
                             GINT_TO_POINTER(pixmap_type));
@@ -463,8 +460,7 @@ setup_pixmap_menu_item(GtkWidget *mi, GnomeUIPixmapType pixmap_type,
 
                 gtk_widget_show(pixmap);
                 
-                gtk_pixmap_menu_item_set_pixmap(GTK_PIXMAP_MENU_ITEM(mi),
-                                                pixmap);
+		g_object_set(G_OBJECT(mi), "image", pixmap, NULL);
         }
 
         notify_id = gconf_client_notify_add(conf,
@@ -984,11 +980,12 @@ create_menu_item (GtkMenuShell       *menu_shell,
 
 		        if ((uiinfo->pixmap_type != GNOME_APP_PIXMAP_NONE) &&
 			    gnome_preferences_get_menus_have_icons()) {
-			        uiinfo->widget = gtk_pixmap_menu_item_new ();
+			        uiinfo->widget = gtk_image_menu_item_new (NULL,
+									  uiinfo->label ? uiinfo->label : "");
 
-                                setup_pixmap_menu_item(uiinfo->widget,
-                                                       uiinfo->pixmap_type, 
-                                                       uiinfo->pixmap_info);
+                                setup_image_menu_item(uiinfo->widget,
+						      uiinfo->pixmap_type, 
+						      uiinfo->pixmap_info);
 			} else
 			        uiinfo->widget = gtk_menu_item_new ();
 		}
diff --git a/libgnomeui/libgnomeui.h b/libgnomeui/libgnomeui.h
index 39d1adc..876e68c 100644
--- a/libgnomeui/libgnomeui.h
+++ b/libgnomeui/libgnomeui.h
@@ -74,7 +74,6 @@
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gtk-clock.h>
 #include <libgnomeui/gtkdial.h>
-#include <libgnomeui/gtkpixmapmenuitem.h>
 #include <libgnomeui/gnome-dateedit.h>
 #include <libgnomeui/gnome-mdi.h>
 #include <libgnomeui/gnome-mdi-child.h>