X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkimagemenuitem.h;h=1c536951734f4ab01433e336fb17326baf787623;hb=bda5987335b8c7828ebf1d289a91accfe2e74dbe;hp=af18dbe111daa9929c9bdf0b215939f4470d8768;hpb=fce9c8b7d45145c4556650843218e0b76c065c18;p=~andy%2Fgtk

diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index af18dbe11..1c5369517 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -12,9 +12,7 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,17 +22,17 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IMAGE_MENU_ITEM_H__
 #define __GTK_IMAGE_MENU_ITEM_H__
 
 
-#include <gdk/gdk.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenuitem.h>
 
+
 G_BEGIN_DECLS
 
 #define GTK_TYPE_IMAGE_MENU_ITEM            (gtk_image_menu_item_get_type ())
@@ -45,20 +43,27 @@ G_BEGIN_DECLS
 #define GTK_IMAGE_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
 
 
-typedef struct _GtkImageMenuItem       GtkImageMenuItem;
-typedef struct _GtkImageMenuItemClass  GtkImageMenuItemClass;
+typedef struct _GtkImageMenuItem              GtkImageMenuItem;
+typedef struct _GtkImageMenuItemPrivate       GtkImageMenuItemPrivate;
+typedef struct _GtkImageMenuItemClass         GtkImageMenuItemClass;
 
 struct _GtkImageMenuItem
 {
   GtkMenuItem menu_item;
 
   /*< private >*/
-  GtkWidget *GSEAL (image);
+  GtkImageMenuItemPrivate *priv;
 };
 
 struct _GtkImageMenuItemClass
 {
   GtkMenuItemClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
@@ -68,9 +73,17 @@ GtkWidget* gtk_image_menu_item_new_with_label    (const gchar      *label);
 GtkWidget* gtk_image_menu_item_new_with_mnemonic (const gchar      *label);
 GtkWidget* gtk_image_menu_item_new_from_stock    (const gchar      *stock_id,
                                                   GtkAccelGroup    *accel_group);
+void       gtk_image_menu_item_set_always_show_image (GtkImageMenuItem *image_menu_item,
+                                                      gboolean          always_show);
+gboolean   gtk_image_menu_item_get_always_show_image (GtkImageMenuItem *image_menu_item);
 void       gtk_image_menu_item_set_image         (GtkImageMenuItem *image_menu_item,
                                                   GtkWidget        *image);
 GtkWidget* gtk_image_menu_item_get_image         (GtkImageMenuItem *image_menu_item);
+void       gtk_image_menu_item_set_use_stock     (GtkImageMenuItem *image_menu_item,
+						  gboolean          use_stock);
+gboolean   gtk_image_menu_item_get_use_stock     (GtkImageMenuItem *image_menu_item);
+void       gtk_image_menu_item_set_accel_group   (GtkImageMenuItem *image_menu_item, 
+						  GtkAccelGroup    *accel_group);
 
 G_END_DECLS