Add _gtk_toggle_action_set_active() internal function

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

diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 64c4f095ec3b2ce0c3c312015b6d57c0cbf01988..c98dbef685244b036b983ee3737836a094c3464a 100644 (file)
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -19,6 +19,10 @@
  *      Mathias Hasselmann
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_TOOL_PALETTE_H__
 #define __GTK_TOOL_PALETTE_H__
 
@@ -28,12 +32,12 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_TOOL_PALETTE           (gtk_tool_palette_get_type())
-#define GTK_TOOL_PALETTE(obj)           (G_TYPE_CHECK_INSTANCE_CAST(obj, GTK_TYPE_TOOL_PALETTE, GtkToolPalette))
-#define GTK_TOOL_PALETTE_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST(cls, GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass))
-#define GTK_IS_TOOL_PALETTE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE(obj, GTK_TYPE_TOOL_PALETTE))
-#define GTK_IS_TOOL_PALETTE_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE(obj, GTK_TYPE_TOOL_PALETTE))
-#define GTK_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass))
+#define GTK_TYPE_TOOL_PALETTE           (gtk_tool_palette_get_type ())
+#define GTK_TOOL_PALETTE(obj)           (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_TOOL_PALETTE, GtkToolPalette))
+#define GTK_TOOL_PALETTE_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass))
+#define GTK_IS_TOOL_PALETTE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_TOOL_PALETTE))
+#define GTK_IS_TOOL_PALETTE_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_TOOL_PALETTE))
+#define GTK_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOL_PALETTE, GtkToolPaletteClass))
 
 typedef struct _GtkToolPalette           GtkToolPalette;
 typedef struct _GtkToolPaletteClass      GtkToolPaletteClass;
@@ -44,7 +48,7 @@ typedef struct _GtkToolPalettePrivate    GtkToolPalettePrivate;
  * @GTK_TOOL_PALETTE_DRAG_ITEMS: Support drag of items.
  * @GTK_TOOL_PALETTE_DRAG_GROUPS: Support drag of groups.
  *
- * Flags used to specify the supported drag targets. 
+ * Flags used to specify the supported drag targets.
  */
 typedef enum /*< flags >*/
 {
@@ -71,43 +75,50 @@ struct _GtkToolPaletteClass
   void (*set_scroll_adjustments) (GtkWidget     *widget,
                                   GtkAdjustment *hadjustment,
                                   GtkAdjustment *vadjustment);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
 };
 
 GType                          gtk_tool_palette_get_type              (void) G_GNUC_CONST;
 GtkWidget*                     gtk_tool_palette_new                   (void);
 
 void                           gtk_tool_palette_set_group_position    (GtkToolPalette            *palette,
-                                                                       GtkWidget                 *group,
+                                                                       GtkToolItemGroup          *group,
                                                                        gint                       position);
 void                           gtk_tool_palette_set_exclusive         (GtkToolPalette            *palette,
-                                                                       GtkWidget                 *group,
+                                                                       GtkToolItemGroup          *group,
                                                                        gboolean                   exclusive);
 void                           gtk_tool_palette_set_expand            (GtkToolPalette            *palette,
-                                                                       GtkWidget                 *group,
+                                                                       GtkToolItemGroup          *group,
                                                                        gboolean                   expand);
 
 gint                           gtk_tool_palette_get_group_position    (GtkToolPalette            *palette,
-                                                                       GtkWidget                 *group);
+                                                                       GtkToolItemGroup          *group);
 gboolean                       gtk_tool_palette_get_exclusive         (GtkToolPalette            *palette,
-                                                                       GtkWidget                 *group);
+                                                                       GtkToolItemGroup          *group);
 gboolean                       gtk_tool_palette_get_expand            (GtkToolPalette            *palette,
-                                                                       GtkWidget                 *group);
+                                                                       GtkToolItemGroup          *group);
 
 void                           gtk_tool_palette_set_icon_size         (GtkToolPalette            *palette,
                                                                        GtkIconSize                icon_size);
-void                           gtk_tool_palette_set_orientation       (GtkToolPalette            *palette,
-                                                                       GtkOrientation             orientation);
+void                           gtk_tool_palette_unset_icon_size       (GtkToolPalette            *palette);
 void                           gtk_tool_palette_set_style             (GtkToolPalette            *palette,
                                                                        GtkToolbarStyle            style);
+void                           gtk_tool_palette_unset_style           (GtkToolPalette            *palette);
 
 GtkIconSize                    gtk_tool_palette_get_icon_size         (GtkToolPalette            *palette);
-GtkOrientation                 gtk_tool_palette_get_orientation       (GtkToolPalette            *palette);
 GtkToolbarStyle                gtk_tool_palette_get_style             (GtkToolPalette            *palette);
 
 GtkToolItem*                   gtk_tool_palette_get_drop_item         (GtkToolPalette            *palette,
                                                                        gint                       x,
                                                                        gint                       y);
-GtkWidget*                     gtk_tool_palette_get_drop_group        (GtkToolPalette            *palette,
+GtkToolItemGroup*              gtk_tool_palette_get_drop_group        (GtkToolPalette            *palette,
                                                                        gint                       x,
                                                                        gint                       y);
 GtkWidget*                     gtk_tool_palette_get_drag_item         (GtkToolPalette            *palette,
@@ -130,4 +141,4 @@ G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) G_G
 
 G_END_DECLS
 
-#endif /* __GTK_TOOL_PALETTE_H__ */ 
+#endif /* __GTK_TOOL_PALETTE_H__ */