X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktoolitemgroup.h;h=c61b282a074cc5fdcc7f6992a6f70d93e3ddf5b2;hb=67f5e595a796a8321d6dc7737c58476564998c07;hp=4a1b9b48c93f4da98c9baad4c897bf06537349a9;hpb=837775af7ba01aa87c5e10b7de0c7772ada9a7a2;p=~andy%2Fgtk

diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index 4a1b9b48c..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,6 +21,10 @@
 #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>
 
@@ -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);