Updated Norwegian bokmål translation

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

diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 404fe20845326688301df8fc8cd7016ff0679dab..ec39c710d8cef6725ed4099c66a03fba154cc21a 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
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -38,6 +38,7 @@ G_BEGIN_DECLS
 
 
 typedef struct _GtkSizeGroup       GtkSizeGroup;
+typedef struct _GtkSizeGroupPriv   GtkSizeGroupPriv;
 typedef struct _GtkSizeGroupClass  GtkSizeGroupClass;
 
 struct _GtkSizeGroup
@@ -45,15 +46,7 @@ struct _GtkSizeGroup
   GObject parent_instance;
 
   /* <private> */
-  GSList *widgets;
-
-  guint8 mode;
-  
-  guint have_width : 1;
-  guint have_height : 1;
-  guint ignore_hidden : 1;
-
-  GtkRequisition requisition;
+  GtkSizeGroupPriv *priv;
 };
 
 struct _GtkSizeGroupClass
@@ -69,11 +62,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.
  **/
@@ -100,11 +93,12 @@ void             gtk_size_group_remove_widget (GtkSizeGroup     *size_group,
 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);
+
+gint _gtk_size_group_bump_requisition      (GtkWidget        *widget,
+                                           GtkSizeGroupMode  mode,
+                                           gint              widget_requisition);
+void _gtk_size_group_queue_resize          (GtkWidget        *widget);
+
 
 G_END_DECLS