stylecontext: Do invalidation on first resize container

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

diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index a7b32507fd8f0057abf83371b8aa447764100189..8b05547c839990bdbe69777216923ee6df861309 100644 (file)
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -12,8 +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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
  *      Mathias Hasselmann
@@ -22,18 +21,22 @@
 #ifndef __GTK_TOOL_PALETTE_H__
 #define __GTK_TOOL_PALETTE_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtktoolitem.h>
 
 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 +47,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 >*/
 {
@@ -68,38 +71,32 @@ struct _GtkToolPaletteClass
 {
   GtkContainerClass parent_class;
 
-  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);
@@ -114,7 +111,7 @@ GtkToolbarStyle                gtk_tool_palette_get_style             (GtkToolPa
 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,
@@ -128,13 +125,16 @@ void                           gtk_tool_palette_add_drag_dest         (GtkToolPa
                                                                        GtkToolPaletteDragTargets  targets,
                                                                        GdkDragAction              actions);
 
+
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_hadjustment)
 GtkAdjustment*                 gtk_tool_palette_get_hadjustment       (GtkToolPalette            *palette);
+GDK_DEPRECATED_IN_3_0_FOR(gtk_scrollable_get_vadjustment)
 GtkAdjustment*                 gtk_tool_palette_get_vadjustment       (GtkToolPalette            *palette);
 
-G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
-G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
+const GtkTargetEntry*          gtk_tool_palette_get_drag_target_item  (void) G_GNUC_CONST;
+const GtkTargetEntry*          gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST;
 
 
 G_END_DECLS
 
-#endif /* __GTK_TOOL_PALETTE_H__ */ 
+#endif /* __GTK_TOOL_PALETTE_H__ */