Change FSF Address

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

diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 4a8315381e9d3cfc5bb63931aa36ad1db0b5e301..7af1338d862e950d46f49421446adb9394ed0bdd 100644 (file)
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -1,5 +1,5 @@
 /* GTK - The GIMP Toolkit
- * gtksizegroup.h: 
+ * gtksizegroup.h:
  * Copyright (C) 2000 Red Hat Software
  *
  * This library is free software; you can redistribute it and/or
@@ -13,11 +13,13 @@
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_SIZE_GROUP_H__
 #define __GTK_SIZE_GROUP_H__
 
@@ -33,23 +35,16 @@ G_BEGIN_DECLS
 #define GTK_SIZE_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SIZE_GROUP, GtkSizeGroupClass))
 
 
-typedef struct _GtkSizeGroup       GtkSizeGroup;
-typedef struct _GtkSizeGroupClass  GtkSizeGroupClass;
+typedef struct _GtkSizeGroup              GtkSizeGroup;
+typedef struct _GtkSizeGroupPrivate       GtkSizeGroupPrivate;
+typedef struct _GtkSizeGroupClass         GtkSizeGroupClass;
 
 struct _GtkSizeGroup
 {
   GObject parent_instance;
 
-  /* <private> */
-  GSList *widgets;
-
-  guint8 mode;
-  
-  guint have_width : 1;
-  guint have_height : 1;
-  guint ignore_hidden : 1;
-
-  GtkRequisition requisition;
+  /*< private >*/
+  GtkSizeGroupPrivate *priv;
 };
 
 struct _GtkSizeGroupClass
@@ -65,11 +60,11 @@ struct _GtkSizeGroupClass
 
 /**
  * GtkSizeGroupMode:
- * @GTK_SIZE_GROUP_NONE: group has no effect  
+ * @GTK_SIZE_GROUP_NONE: group has no effect
  * @GTK_SIZE_GROUP_HORIZONTAL: group affects horizontal requisition
  * @GTK_SIZE_GROUP_VERTICAL: group affects vertical requisition
  * @GTK_SIZE_GROUP_BOTH: group affects both horizontal and vertical requisition
- * 
+ *
  * The mode of the size group determines the directions in which the size
  * group affects the requested sizes of its component widgets.
  **/
@@ -95,13 +90,6 @@ void             gtk_size_group_remove_widget (GtkSizeGroup     *size_group,
                                               GtkWidget        *widget);
 GSList *         gtk_size_group_get_widgets   (GtkSizeGroup     *size_group);
 
-
-void _gtk_size_group_get_child_requisition (GtkWidget      *widget,
-                                           GtkRequisition *requisition);
-void _gtk_size_group_compute_requisition   (GtkWidget      *widget,
-                                           GtkRequisition *requisition);
-void _gtk_size_group_queue_resize          (GtkWidget      *widget);
-
 G_END_DECLS
 
 #endif /* __GTK_SIZE_GROUP_H__ */