]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktoolbar.h
Fix a C99ism
[~andy/gtk] / gtk / gtktoolbar.h
index acc32d5d254ded68d484b3d82122c468183320e2..e80134d2008fa5a89682a010a3ed8be36de02f4c 100644 (file)
@@ -2,6 +2,10 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  * GtkToolbar copyright (C) Federico Mena
  *
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org>
+ * Copyright (C) 2002 James Henstridge <james@daa.com.au>
+ * Copyright (C) 2003 Soeren Sandmann <sandmann@daimi.au.dk>
+ * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
 #ifndef __GTK_TOOLBAR_H__
 #define __GTK_TOOLBAR_H__
 
-
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkenums.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
 #include <gtk/gtktooltips.h>
 
+#include "gtktoolitem.h"
+
+#ifndef GTK_DISABLE_DEPRECATED
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+/* Not needed, retained for compatibility -Yosh */
+#include <gtk/gtkpixmap.h>
+#include <gtk/gtksignal.h>
 
+#endif /* GTK_DISABLE_DEPRECATED */
 
-#define GTK_TYPE_TOOLBAR                  (gtk_toolbar_get_type ())
-#define GTK_TOOLBAR(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
-#define GTK_TOOLBAR_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
-#define GTK_IS_TOOLBAR(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TOOLBAR))
-#define GTK_IS_TOOLBAR_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLBAR))
-#define GTK_TOOLBAR_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass))
+G_BEGIN_DECLS
 
+#define GTK_TYPE_TOOLBAR            (gtk_toolbar_get_type ())
+#define GTK_TOOLBAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOOLBAR, GtkToolbar))
+#define GTK_TOOLBAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOOLBAR, GtkToolbarClass))
+#define GTK_IS_TOOLBAR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOOLBAR))
+#define GTK_IS_TOOLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TOOLBAR))
+#define GTK_TOOLBAR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOLBAR, GtkToolbarClass))
 
+#ifndef GTK_DISABLE_DEPRECATED
 typedef enum
 {
   GTK_TOOLBAR_CHILD_SPACE,
@@ -59,15 +66,7 @@ typedef enum
   GTK_TOOLBAR_CHILD_WIDGET
 } GtkToolbarChildType;
 
-typedef enum
-{
-  GTK_TOOLBAR_SPACE_EMPTY,
-  GTK_TOOLBAR_SPACE_LINE
-} GtkToolbarSpaceStyle;
-
-typedef struct _GtkToolbarChild      GtkToolbarChild;
-typedef struct _GtkToolbar           GtkToolbar;
-typedef struct _GtkToolbarClass      GtkToolbarClass;
+typedef struct _GtkToolbarChild             GtkToolbarChild;
 
 struct _GtkToolbarChild
 {
@@ -77,24 +76,38 @@ struct _GtkToolbarChild
   GtkWidget *label;
 };
 
+#endif /* GTK_DISABLE_DEPRECATED */
+
+typedef enum
+{
+  GTK_TOOLBAR_SPACE_EMPTY,
+  GTK_TOOLBAR_SPACE_LINE
+} GtkToolbarSpaceStyle;
+
+typedef struct _GtkToolbar           GtkToolbar;
+typedef struct _GtkToolbarClass      GtkToolbarClass;
+typedef struct _GtkToolbarPrivate    GtkToolbarPrivate;
+
 struct _GtkToolbar
 {
   GtkContainer container;
 
+  /*< public >*/
   gint             num_children;
   GList           *children;
   GtkOrientation   orientation;
   GtkToolbarStyle  style;
   GtkIconSize      icon_size;
-
+  
   GtkTooltips     *tooltips;
+  
+  /*< private >*/
+  gint             button_maxw;                /* maximum width of homogeneous children */
+  gint             button_maxh;                /* maximum height of homogeneous children */
 
-  gint             button_maxw;
-  gint             button_maxh;
+  guint            _gtk_reserved1;
+  guint            _gtk_reserved2;
 
-  guint            style_set_connection;
-  guint            icon_size_connection;
-  
   guint            style_set : 1;
   guint            icon_size_set : 1;
 };
@@ -102,46 +115,94 @@ struct _GtkToolbar
 struct _GtkToolbarClass
 {
   GtkContainerClass parent_class;
-
-  void (* orientation_changed) (GtkToolbar      *toolbar,
-                               GtkOrientation   orientation);
-  void (* style_changed)       (GtkToolbar      *toolbar,
-                               GtkToolbarStyle  style);
-
+  
+  /* signals */
+  void     (* orientation_changed) (GtkToolbar       *toolbar,
+                                   GtkOrientation    orientation);
+  void     (* style_changed)       (GtkToolbar       *toolbar,
+                                   GtkToolbarStyle   style);
+  gboolean (* popup_context_menu)  (GtkToolbar       *toolbar,
+                                   gint              x,
+                                   gint              y,
+                                   gint              button_number);
+  
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
 };
 
-
-GtkType    gtk_toolbar_get_type        (void) G_GNUC_CONST;
-GtkWidget* gtk_toolbar_new             (void);
+GType           gtk_toolbar_get_type         (void) G_GNUC_CONST;
+GtkWidget*      gtk_toolbar_new                     (void);
+void            gtk_toolbar_insert                  (GtkToolbar      *toolbar,
+                                                    GtkToolItem     *item,
+                                                    gint             pos);
+gint            gtk_toolbar_get_item_index          (GtkToolbar      *toolbar,
+                                                    GtkToolItem     *item);
+gint            gtk_toolbar_get_n_items             (GtkToolbar      *toolbar);
+GtkToolItem *   gtk_toolbar_get_nth_item            (GtkToolbar      *toolbar,
+                                                    gint             n);
+gboolean        gtk_toolbar_get_show_arrow          (GtkToolbar      *toolbar);
+void            gtk_toolbar_set_show_arrow          (GtkToolbar      *toolbar,
+                                                    gboolean         show_arrow);
+GtkOrientation  gtk_toolbar_get_orientation         (GtkToolbar      *toolbar);
+void            gtk_toolbar_set_orientation         (GtkToolbar      *toolbar,
+                                                    GtkOrientation   orientation);
+gboolean        gtk_toolbar_get_tooltips            (GtkToolbar      *toolbar);
+void            gtk_toolbar_set_tooltips            (GtkToolbar      *toolbar,
+                                                    gboolean         enable);
+GtkToolbarStyle gtk_toolbar_get_style               (GtkToolbar      *toolbar);
+void            gtk_toolbar_set_style               (GtkToolbar      *toolbar,
+                                                    GtkToolbarStyle  style);
+void            gtk_toolbar_unset_style             (GtkToolbar      *toolbar);
+GtkIconSize     gtk_toolbar_get_icon_size           (GtkToolbar      *toolbar);
+GtkReliefStyle  gtk_toolbar_get_relief_style        (GtkToolbar      *toolbar);
+gint            gtk_toolbar_get_drop_index          (GtkToolbar      *toolbar,
+                                                    gint             x,
+                                                    gint             y);
+void            gtk_toolbar_set_drop_highlight_item (GtkToolbar      *toolbar,
+                                                    GtkToolItem     *tool_item,
+                                                    gint             index_);
+
+/* internal functions */
+gchar *         _gtk_toolbar_elide_underscores      (const gchar     *original);
+void            _gtk_toolbar_paint_space_line       (GtkWidget       *widget,
+                                                    GtkToolbar      *toolbar,
+                                                    GdkRectangle    *area,
+                                                    GtkAllocation   *allocation);
+gint            _gtk_toolbar_get_default_space_size (void);
+void            _gtk_toolbar_rebuild_menu           (GtkToolbar      *toolbar);
+
+
+/* deprecated */
+#ifndef GTK_DISABLE_DEPRECATED
+void       gtk_toolbar_set_icon_size   (GtkToolbar      *toolbar,
+                                       GtkIconSize      icon_size);
+void       gtk_toolbar_unset_icon_size (GtkToolbar      *toolbar);
 
 /* Simple button items */
-GtkWidget* gtk_toolbar_append_item     (GtkToolbar      *toolbar,
-                                       const char      *text,
-                                       const char      *tooltip_text,
-                                       const char      *tooltip_private_text,
-                                       GtkWidget       *icon,
-                                       GtkSignalFunc    callback,
-                                       gpointer         user_data);
-GtkWidget* gtk_toolbar_prepend_item    (GtkToolbar      *toolbar,
-                                       const char      *text,
-                                       const char      *tooltip_text,
-                                       const char      *tooltip_private_text,
-                                       GtkWidget       *icon,
-                                       GtkSignalFunc    callback,
-                                       gpointer         user_data);
-GtkWidget* gtk_toolbar_insert_item     (GtkToolbar      *toolbar,
-                                       const char      *text,
-                                       const char      *tooltip_text,
-                                       const char      *tooltip_private_text,
-                                       GtkWidget       *icon,
-                                       GtkSignalFunc    callback,
-                                       gpointer         user_data,
-                                       gint             position);
+GtkWidget* gtk_toolbar_append_item   (GtkToolbar      *toolbar,
+                                     const char      *text,
+                                     const char      *tooltip_text,
+                                     const char      *tooltip_private_text,
+                                     GtkWidget       *icon,
+                                     GtkSignalFunc    callback,
+                                     gpointer         user_data);
+GtkWidget* gtk_toolbar_prepend_item  (GtkToolbar      *toolbar,
+                                     const char      *text,
+                                     const char      *tooltip_text,
+                                     const char      *tooltip_private_text,
+                                     GtkWidget       *icon,
+                                     GtkSignalFunc    callback,
+                                     gpointer         user_data);
+GtkWidget* gtk_toolbar_insert_item   (GtkToolbar      *toolbar,
+                                     const char      *text,
+                                     const char      *tooltip_text,
+                                     const char      *tooltip_private_text,
+                                     GtkWidget       *icon,
+                                     GtkSignalFunc    callback,
+                                     gpointer         user_data,
+                                     gint             position);
 
 /* Stock Items */
 GtkWidget* gtk_toolbar_insert_stock    (GtkToolbar      *toolbar,
@@ -152,8 +213,6 @@ GtkWidget* gtk_toolbar_insert_stock    (GtkToolbar      *toolbar,
                                        gpointer         user_data,
                                        gint             position);
 
-
-
 /* Space Items */
 void       gtk_toolbar_append_space    (GtkToolbar      *toolbar);
 void       gtk_toolbar_prepend_space   (GtkToolbar      *toolbar);
@@ -161,7 +220,6 @@ void       gtk_toolbar_insert_space    (GtkToolbar      *toolbar,
                                        gint             position);
 void       gtk_toolbar_remove_space    (GtkToolbar      *toolbar,
                                         gint             position);
-
 /* Any element type */
 GtkWidget* gtk_toolbar_append_element  (GtkToolbar      *toolbar,
                                        GtkToolbarChildType type,
@@ -209,25 +267,9 @@ void       gtk_toolbar_insert_widget   (GtkToolbar      *toolbar,
                                        const char      *tooltip_private_text,
                                        gint             position);
 
-/* Style functions */
-void       gtk_toolbar_set_orientation       (GtkToolbar           *toolbar,
-                                             GtkOrientation        orientation);
-void       gtk_toolbar_set_style             (GtkToolbar           *toolbar,
-                                             GtkToolbarStyle       style);
-void       gtk_toolbar_set_icon_size         (GtkToolbar           *toolbar,
-                                              GtkIconSize           icon_size);
-void       gtk_toolbar_set_tooltips          (GtkToolbar           *toolbar,
-                                             gboolean              enable);
-void       gtk_toolbar_unset_style           (GtkToolbar           *toolbar);
-void       gtk_toolbar_unset_icon_size       (GtkToolbar           *toolbar);
-
-GtkOrientation  gtk_toolbar_get_orientation  (GtkToolbar           *toolbar);
-GtkToolbarStyle gtk_toolbar_get_style        (GtkToolbar           *toolbar);
-GtkIconSize     gtk_toolbar_get_icon_size    (GtkToolbar           *toolbar);
-gboolean        gtk_toolbar_get_tooltips     (GtkToolbar           *toolbar);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#endif /* GTK_DISABLE_DEPRECATED */
+
+
+G_END_DECLS
 
 #endif /* __GTK_TOOLBAR_H__ */