X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktoolitemgroup.h;h=c61b282a074cc5fdcc7f6992a6f70d93e3ddf5b2;hb=79695ee64d41c9aadfe2c6f18dc7dd1e3fd44852;hp=ad3149488dcd8d72dd54bfde97af7cad2153520e;hpb=0e2a5509f6a4ef181497a1dde76afcda07bfddcc;p=~andy%2Fgtk

diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index ad3149488..c61b282a0 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.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,17 +21,21 @@
 #ifndef __GTK_TOOL_ITEM_GROUP_H__
 #define __GTK_TOOL_ITEM_GROUP_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/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_TOOL_ITEM_GROUP           (gtk_tool_item_group_get_type())
-#define GTK_TOOL_ITEM_GROUP(obj)           (G_TYPE_CHECK_INSTANCE_CAST(obj, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroup))
-#define GTK_TOOL_ITEM_GROUP_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST(cls, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass))
-#define GTK_IS_TOOL_ITEM_GROUP(obj)        (G_TYPE_CHECK_INSTANCE_TYPE(obj, GTK_TYPE_TOOL_ITEM_GROUP))
-#define GTK_IS_TOOL_ITEM_GROUP_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE(obj, GTK_TYPE_TOOL_ITEM_GROUP))
-#define GTK_TOOL_ITEM_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass))
+#define GTK_TYPE_TOOL_ITEM_GROUP           (gtk_tool_item_group_get_type ())
+#define GTK_TOOL_ITEM_GROUP(obj)           (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroup))
+#define GTK_TOOL_ITEM_GROUP_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass))
+#define GTK_IS_TOOL_ITEM_GROUP(obj)        (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_TOOL_ITEM_GROUP))
+#define GTK_IS_TOOL_ITEM_GROUP_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_TOOL_ITEM_GROUP))
+#define GTK_TOOL_ITEM_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TOOL_ITEM_GROUP, GtkToolItemGroupClass))
 
 typedef struct _GtkToolItemGroup        GtkToolItemGroup;
 typedef struct _GtkToolItemGroupClass   GtkToolItemGroupClass;
@@ -52,6 +55,12 @@ struct _GtkToolItemGroup
 struct _GtkToolItemGroupClass
 {
   GtkContainerClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType                 gtk_tool_item_group_get_type          (void) G_GNUC_CONST;
@@ -68,7 +77,7 @@ void                  gtk_tool_item_group_set_ellipsize     (GtkToolItemGroup
 void                  gtk_tool_item_group_set_header_relief (GtkToolItemGroup   *group,
                                                              GtkReliefStyle      style);
 
-G_CONST_RETURN gchar* gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
+const gchar *         gtk_tool_item_group_get_label         (GtkToolItemGroup   *group);
 GtkWidget            *gtk_tool_item_group_get_label_widget  (GtkToolItemGroup   *group);
 gboolean              gtk_tool_item_group_get_collapsed     (GtkToolItemGroup   *group);
 PangoEllipsizeMode    gtk_tool_item_group_get_ellipsize     (GtkToolItemGroup   *group);