X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbbox.h;h=812f516fd849528e70f8727d2d3a9f47bdcd1e83;hb=32aa7f0582febb614c41e4130ad34ac44ef6efd2;hp=f0666a210fc985b03323a476d00fc3d041393f8e;hpb=6c365eba73b9125ab946200313a2b96d5c8599b5;p=~andy%2Fgtk

diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index f0666a210..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/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !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__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbox.h>
 
 
@@ -42,64 +40,51 @@ 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 _GtkButtonBoxClass  GtkButtonBoxClass;
+
+typedef struct _GtkButtonBox              GtkButtonBox;
+typedef struct _GtkButtonBoxPrivate       GtkButtonBoxPrivate;
+typedef struct _GtkButtonBoxClass         GtkButtonBoxClass;
 
 struct _GtkButtonBox
 {
   GtkBox box;
-  gint GSEAL (child_min_width);
-  gint GSEAL (child_min_height);
-  gint GSEAL (child_ipad_x);
-  gint GSEAL (child_ipad_y);
-  GtkButtonBoxStyle GSEAL (layout_style);
+
+  /*< private >*/
+  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);
+};
 
-GType gtk_button_box_get_type (void) G_GNUC_CONST;
 
+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);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define gtk_button_box_set_spacing(b,s) gtk_box_set_spacing (GTK_BOX (b), s)
-#define gtk_button_box_get_spacing(b)   gtk_box_get_spacing (GTK_BOX (b))
-
-void gtk_button_box_set_child_size     (GtkButtonBox *widget,
-					gint          min_width,
-					gint          min_height);
-void gtk_button_box_set_child_ipadding (GtkButtonBox *widget,
-					gint          ipad_x,
-					gint          ipad_y);
-void gtk_button_box_get_child_size     (GtkButtonBox *widget,
-					gint         *min_width,
-					gint         *min_height);
-void gtk_button_box_get_child_ipadding (GtkButtonBox *widget,
-					gint         *ipad_x,
-					gint         *ipad_y);
-#endif
+                                                      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);
+
 
-/* Internal method - do not use. */
-void _gtk_button_box_child_requisition (GtkWidget *widget,
-					int       *nvis_children,
-					int       *nvis_secondaries,
-					int       *width,
-					int       *height);
 G_END_DECLS
 
 #endif /* __GTK_BUTTON_BOX_H__ */