X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbbox.h;h=812f516fd849528e70f8727d2d3a9f47bdcd1e83;hb=67f5e595a796a8321d6dc7737c58476564998c07;hp=a63a50883c2c99085875d3771e98ebdf9f7843d2;hpb=abe267641a1ba63903d3191b0c6d7044fe260112;p=~andy%2Fgtk

diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index a63a50883..812f516fd 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -12,9 +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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_BUTTON_BOX_H__
+#define __GTK_BUTTON_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_BUTTON_BOX_H__
-#define __GTK_BUTTON_BOX_H__
-
 #include <gtk/gtkbox.h>
 
 
@@ -42,25 +40,29 @@ G_BEGIN_DECLS
 #define GTK_IS_BUTTON_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_BOX))
 #define GTK_IS_BUTTON_BOX_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON_BOX))
 #define GTK_BUTTON_BOX_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBoxClass))
-  
 
-#define GTK_BUTTONBOX_DEFAULT -1
- 
-typedef struct _GtkButtonBox       GtkButtonBox;
-typedef struct _GtkButtonBoxPriv   GtkButtonBoxPriv;
-typedef struct _GtkButtonBoxClass  GtkButtonBoxClass;
+
+typedef struct _GtkButtonBox              GtkButtonBox;
+typedef struct _GtkButtonBoxPrivate       GtkButtonBoxPrivate;
+typedef struct _GtkButtonBoxClass         GtkButtonBoxClass;
 
 struct _GtkButtonBox
 {
   GtkBox box;
 
   /*< private >*/
-  GtkButtonBoxPriv *priv;
+  GtkButtonBoxPrivate *priv;
 };
 
 struct _GtkButtonBoxClass
 {
   GtkBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
@@ -68,19 +70,21 @@ GType             gtk_button_box_get_type            (void) G_GNUC_CONST;
 GtkWidget       * gtk_button_box_new                 (GtkOrientation     orientation);
 GtkButtonBoxStyle gtk_button_box_get_layout          (GtkButtonBox      *widget);
 void              gtk_button_box_set_layout          (GtkButtonBox      *widget,
-						      GtkButtonBoxStyle  layout_style);
+                                                      GtkButtonBoxStyle  layout_style);
 gboolean          gtk_button_box_get_child_secondary (GtkButtonBox      *widget,
-						      GtkWidget         *child);
+                                                      GtkWidget         *child);
 void              gtk_button_box_set_child_secondary (GtkButtonBox      *widget,
-						      GtkWidget         *child,
-						      gboolean           is_secondary);
-
-/* Internal method - do not use. */
-void _gtk_button_box_child_requisition (GtkWidget *widget,
-					int       *nvis_children,
-					int       *nvis_secondaries,
-					int       *width,
-					int       *height);
+                                                      GtkWidget         *child,
+                                                      gboolean           is_secondary);
+GDK_AVAILABLE_IN_3_2
+gboolean          gtk_button_box_get_child_non_homogeneous (GtkButtonBox *widget,
+                                                            GtkWidget    *child);
+GDK_AVAILABLE_IN_3_2
+void              gtk_button_box_set_child_non_homogeneous (GtkButtonBox *widget,
+                                                            GtkWidget    *child,
+                                                            gboolean      non_homogeneous);
+
+
 G_END_DECLS
 
 #endif /* __GTK_BUTTON_BOX_H__ */