summaryrefslogtreecommitdiff
path: root/gtk/gtkpaned.h
diff options
context:
space:
mode:
authorMichael Natterer <mitch@gimp.org>2008-11-07 16:39:50 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-11-07 16:39:50 +0000
commit59f0703855d6066aaef0a4e9b8dd2f2edd3fbdf2 (patch)
tree2b2722da77749249f22a35c957a1a0ba6945939b /gtk/gtkpaned.h
parent3e72ccbcdc75422010100354ac3d226746195626 (diff)
downloadgtk+-59f0703855d6066aaef0a4e9b8dd2f2edd3fbdf2.tar.gz
Bug 553586 – Add orientation API to GtkPaned
2008-11-07 Michael Natterer <mitch@gimp.org> Bug 553586 – Add orientation API to GtkPaned * gtk/gtkpaned.[ch]: implement the GtkOrientable interface and swallow all code from GtkHPaned and GtkVPaned. Add gtk_paned_new() which takes a GtkOrientation argument. Deprecate gtk_paned_compute_position() for good (also for GTK_COMPILATION). * gtk/gtkhpaned.[ch] * gtk/gtkvpaned.[ch]: remove all code except the constructor and call gtk_orientable_set_orientation() in init(). * gtk/gtk.symbols: add gtk_box_new(). svn path=/trunk/; revision=21772
Diffstat (limited to 'gtk/gtkpaned.h')
-rw-r--r--gtk/gtkpaned.h52
1 files changed, 26 insertions, 26 deletions
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index f816105986..a1c774d913 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
@@ -107,34 +106,35 @@ struct _GtkPanedClass
};
-GType gtk_paned_get_type (void) G_GNUC_CONST;
-void gtk_paned_add1 (GtkPaned *paned,
- GtkWidget *child);
-void gtk_paned_add2 (GtkPaned *paned,
- GtkWidget *child);
-void gtk_paned_pack1 (GtkPaned *paned,
- GtkWidget *child,
- gboolean resize,
- gboolean shrink);
-void gtk_paned_pack2 (GtkPaned *paned,
- GtkWidget *child,
- gboolean resize,
- gboolean shrink);
-gint gtk_paned_get_position (GtkPaned *paned);
-void gtk_paned_set_position (GtkPaned *paned,
- gint position);
-
-GtkWidget *gtk_paned_get_child1 (GtkPaned *paned);
-GtkWidget *gtk_paned_get_child2 (GtkPaned *paned);
+GType gtk_paned_get_type (void) G_GNUC_CONST;
+GtkWidget * gtk_paned_new (GtkOrientation orientation);
+void gtk_paned_add1 (GtkPaned *paned,
+ GtkWidget *child);
+void gtk_paned_add2 (GtkPaned *paned,
+ GtkWidget *child);
+void gtk_paned_pack1 (GtkPaned *paned,
+ GtkWidget *child,
+ gboolean resize,
+ gboolean shrink);
+void gtk_paned_pack2 (GtkPaned *paned,
+ GtkWidget *child,
+ gboolean resize,
+ gboolean shrink);
+
+gint gtk_paned_get_position (GtkPaned *paned);
+void gtk_paned_set_position (GtkPaned *paned,
+ gint position);
+
+GtkWidget * gtk_paned_get_child1 (GtkPaned *paned);
+GtkWidget * gtk_paned_get_child2 (GtkPaned *paned);
+
+#ifndef GTK_DISABLE_DEPRECATED
/* Internal function */
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
void gtk_paned_compute_position (GtkPaned *paned,
- gint allocation,
- gint child1_req,
- gint child2_req);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-#ifndef GTK_DISABLE_DEPRECATED
+ gint allocation,
+ gint child1_req,
+ gint child2_req);
#define gtk_paned_gutter_size(p,s) (void) 0
#define gtk_paned_set_gutter_size(p,s) (void) 0
#endif /* GTK_DISABLE_DEPRECATED */