GtkBubbleWindow: rework how drawing is done

[~andy/gtk] / gtk / gtkimagemenuitem.h

diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index 714bcf76ccfbb833cbcc058b9b71c8591d6e6c08..1c536951734f4ab01433e336fb17326baf787623 100644 (file)
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -12,68 +12,79 @@
  * 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/>.
  */
 
 /*
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef __GTK_MENU_IMAGE_ITEM_H__
-#define __GTK_MENU_IMAGE_ITEM_H__
+#ifndef __GTK_IMAGE_MENU_ITEM_H__
+#define __GTK_IMAGE_MENU_ITEM_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkmenuitem.h>
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
+#include <gtk/gtkmenuitem.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
 
+G_BEGIN_DECLS
 
 #define GTK_TYPE_IMAGE_MENU_ITEM            (gtk_image_menu_item_get_type ())
-#define GTK_IMAGE_MENU_ITEM(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItem))
-#define GTK_IMAGE_MENU_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
-#define GTK_IS_IMAGE_MENU_ITEM(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMAGE_MENU_ITEM))
-#define GTK_IS_IMAGE_MENU_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_MENU_ITEM))
-#define GTK_IMAGE_MENU_ITEM_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
+#define GTK_IMAGE_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItem))
+#define GTK_IMAGE_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_MENU_ITEM, GtkImageMenuItemClass))
+#define GTK_IS_IMAGE_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_MENU_ITEM))
+#define GTK_IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_MENU_ITEM))
+#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 *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);
+};
 
-GtkType           gtk_image_menu_item_get_type       (void) G_GNUC_CONST;
-GtkWidget* gtk_image_menu_item_new            (GtkWidget        *widget,
-                                              const gchar      *label);
-GtkWidget* gtk_image_menu_item_new_from_stock (const gchar      *stock_id,
-                                              GtkAccelGroup    *accel_group);
-void       gtk_image_menu_item_add_image      (GtkImageMenuItem *image_menu_item,
-                                              GtkWidget        *child);
-GtkWidget* gtk_image_menu_item_get_image      (GtkImageMenuItem *image_menu_item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+GType     gtk_image_menu_item_get_type          (void) G_GNUC_CONST;
+GtkWidget* gtk_image_menu_item_new               (void);
+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
 
 #endif /* __GTK_IMAGE_MENU_ITEM_H__ */