X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkexpander.h;h=2f9c7b181611b1be7698c6ba5a1cf71ec788d37e;hb=1074aa0c49f647ed4b2a969618051c59da5aad01;hp=3c7a6071bb294ed5a9d858456fd2562cd534f829;hpb=6fae72c419679be63c24790243e28d1cb04d2835;p=~andy%2Fgtk

diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index 3c7a6071b..2f9c7b181 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -13,21 +13,19 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library 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/>.
  *
  * Authors:
  *	Mark McLoughlin <mark@skynet.ie>
  */
 
+#ifndef __GTK_EXPANDER_H__
+#define __GTK_EXPANDER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_EXPANDER_H__
-#define __GTK_EXPANDER_H__
-
 #include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
@@ -58,37 +56,51 @@ struct _GtkExpanderClass
    * state connect to notify:expanded.
    */
   void        (* activate) (GtkExpander *expander);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GType                 gtk_expander_get_type          (void) G_GNUC_CONST;
+GType                 gtk_expander_get_type            (void) G_GNUC_CONST;
 
-GtkWidget            *gtk_expander_new               (const gchar *label);
-GtkWidget            *gtk_expander_new_with_mnemonic (const gchar *label);
+GtkWidget            *gtk_expander_new                 (const gchar *label);
+GtkWidget            *gtk_expander_new_with_mnemonic   (const gchar *label);
 
-void                  gtk_expander_set_expanded      (GtkExpander *expander,
-						      gboolean     expanded);
-gboolean              gtk_expander_get_expanded      (GtkExpander *expander);
+void                  gtk_expander_set_expanded        (GtkExpander *expander,
+                                                        gboolean     expanded);
+gboolean              gtk_expander_get_expanded        (GtkExpander *expander);
 
 /* Spacing between the expander/label and the child */
-void                  gtk_expander_set_spacing       (GtkExpander *expander,
-						      gint         spacing);
-gint                  gtk_expander_get_spacing       (GtkExpander *expander);
-
-void                  gtk_expander_set_label         (GtkExpander *expander,
-						      const gchar *label);
-G_CONST_RETURN gchar *gtk_expander_get_label         (GtkExpander *expander);
-
-void                  gtk_expander_set_use_underline (GtkExpander *expander,
-						      gboolean     use_underline);
-gboolean              gtk_expander_get_use_underline (GtkExpander *expander);
-
-void                  gtk_expander_set_use_markup    (GtkExpander *expander,
-						      gboolean    use_markup);
-gboolean              gtk_expander_get_use_markup    (GtkExpander *expander);
-
-void                  gtk_expander_set_label_widget  (GtkExpander *expander,
-						      GtkWidget   *label_widget);
-GtkWidget            *gtk_expander_get_label_widget  (GtkExpander *expander);
+void                  gtk_expander_set_spacing         (GtkExpander *expander,
+                                                        gint         spacing);
+gint                  gtk_expander_get_spacing         (GtkExpander *expander);
+
+void                  gtk_expander_set_label           (GtkExpander *expander,
+                                                        const gchar *label);
+const gchar *         gtk_expander_get_label           (GtkExpander *expander);
+
+void                  gtk_expander_set_use_underline   (GtkExpander *expander,
+                                                        gboolean     use_underline);
+gboolean              gtk_expander_get_use_underline   (GtkExpander *expander);
+
+void                  gtk_expander_set_use_markup      (GtkExpander *expander,
+                                                        gboolean    use_markup);
+gboolean              gtk_expander_get_use_markup      (GtkExpander *expander);
+
+void                  gtk_expander_set_label_widget    (GtkExpander *expander,
+						        GtkWidget   *label_widget);
+GtkWidget            *gtk_expander_get_label_widget    (GtkExpander *expander);
+void                  gtk_expander_set_label_fill      (GtkExpander *expander,
+						        gboolean     label_fill);
+gboolean              gtk_expander_get_label_fill      (GtkExpander *expander);
+GDK_AVAILABLE_IN_3_2
+void                  gtk_expander_set_resize_toplevel (GtkExpander *expander,
+                                                        gboolean     resize_toplevel);
+GDK_AVAILABLE_IN_3_2
+gboolean              gtk_expander_get_resize_toplevel (GtkExpander *expander);
 
 G_END_DECLS