Adapt cast macros to standard.

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

diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 17c05dddb0d52f03535325293a77b263362032ce..3c82eb2bc0dea2e3336d4a36bd20f9898f476afd 100644 (file)
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -18,6 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  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/. 
+ */
+
 #ifndef __GTK_TOOLBAR_H__
 #define __GTK_TOOLBAR_H__
 
@@ -35,9 +42,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_TOOLBAR(obj)        GTK_CHECK_CAST (obj, gtk_toolbar_get_type (), GtkToolbar)
-#define GTK_TOOLBAR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_toolbar_get_type (), GtkToolbarClass)
-#define GTK_IS_TOOLBAR(obj)      GTK_CHECK_TYPE (obj, gtk_toolbar_get_type ())
+#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))
 
 typedef enum
 {
@@ -48,6 +57,12 @@ 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;
@@ -69,6 +84,7 @@ struct _GtkToolbar
   GtkOrientation   orientation;
   GtkToolbarStyle  style;
   gint             space_size; /* big optional space between buttons */
+  GtkToolbarSpaceStyle space_style;
 
   GtkTooltips     *tooltips;
 
@@ -88,26 +104,26 @@ struct _GtkToolbarClass
 };
 
 
-guint      gtk_toolbar_get_type        (void);
-GtkWidget *gtk_toolbar_new             (GtkOrientation   orientation,
+GtkType    gtk_toolbar_get_type        (void);
+GtkWidget* gtk_toolbar_new             (GtkOrientation   orientation,
                                        GtkToolbarStyle  style);
 
 /* Simple button items */
-GtkWidget *gtk_toolbar_append_item     (GtkToolbar      *toolbar,
+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,
+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,
+GtkWidget* gtk_toolbar_insert_item     (GtkToolbar      *toolbar,
                                        const char      *text,
                                        const char      *tooltip_text,
                                        const char      *tooltip_private_text,
@@ -123,7 +139,7 @@ void       gtk_toolbar_insert_space    (GtkToolbar      *toolbar,
                                        gint             position);
 
 /* Any element type */
-GtkWidget *gtk_toolbar_append_element  (GtkToolbar      *toolbar,
+GtkWidget* gtk_toolbar_append_element  (GtkToolbar      *toolbar,
                                        GtkToolbarChildType type,
                                        GtkWidget       *widget,
                                        const char      *text,
@@ -133,7 +149,7 @@ GtkWidget *gtk_toolbar_append_element  (GtkToolbar      *toolbar,
                                        GtkSignalFunc    callback,
                                        gpointer         user_data);
 
-GtkWidget *gtk_toolbar_prepend_element (GtkToolbar      *toolbar,
+GtkWidget* gtk_toolbar_prepend_element (GtkToolbar      *toolbar,
                                        GtkToolbarChildType type,
                                        GtkWidget       *widget,
                                        const char      *text,
@@ -143,7 +159,7 @@ GtkWidget *gtk_toolbar_prepend_element (GtkToolbar      *toolbar,
                                        GtkSignalFunc    callback,
                                        gpointer         user_data);
 
-GtkWidget *gtk_toolbar_insert_element  (GtkToolbar      *toolbar,
+GtkWidget* gtk_toolbar_insert_element  (GtkToolbar      *toolbar,
                                        GtkToolbarChildType type,
                                        GtkWidget       *widget,
                                        const char      *text,
@@ -170,17 +186,19 @@ void       gtk_toolbar_insert_widget   (GtkToolbar      *toolbar,
                                        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_space_size  (GtkToolbar      *toolbar,
-                                       gint             space_size);
-void       gtk_toolbar_set_tooltips    (GtkToolbar      *toolbar,
-                                       gint             enable);
-void       gtk_toolbar_set_button_relief      (GtkToolbar      *toolbar,
-                                       GtkReliefStyle   relief);
-GtkReliefStyle gtk_toolbar_get_button_relief  (GtkToolbar      *toolbar);
+void       gtk_toolbar_set_orientation       (GtkToolbar           *toolbar,
+                                             GtkOrientation        orientation);
+void       gtk_toolbar_set_style             (GtkToolbar           *toolbar,
+                                             GtkToolbarStyle       style);
+void       gtk_toolbar_set_space_size        (GtkToolbar           *toolbar,
+                                             gint                  space_size);
+void       gtk_toolbar_set_space_style       (GtkToolbar           *toolbar,
+                                             GtkToolbarSpaceStyle  space_style);
+void       gtk_toolbar_set_tooltips          (GtkToolbar           *toolbar,
+                                             gint                  enable);
+void       gtk_toolbar_set_button_relief     (GtkToolbar           *toolbar,
+                                             GtkReliefStyle        relief);
+GtkReliefStyle gtk_toolbar_get_button_relief (GtkToolbar           *toolbar);
 
 
 #ifdef __cplusplus