Improve wording. String change! (#355128, David Lodge)

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

diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 695eeaba6587ce48befabe44b73dafa1088a524d..003316aef73de822be9d46fc24975c896ccea343 100644 (file)
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -30,10 +30,7 @@
 
 #include <gtk/gtkcontainer.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 #define GTK_TYPE_PANED                  (gtk_paned_get_type ())
 #define GTK_PANED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
@@ -43,9 +40,10 @@ extern "C" {
 #define GTK_PANED_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
 
 
-typedef struct _GtkPaned      GtkPaned;
-typedef struct _GtkPanedClass GtkPanedClass;
-
+typedef struct _GtkPaned        GtkPaned;
+typedef struct _GtkPanedClass   GtkPanedClass;
+typedef struct _GtkPanedPrivate GtkPanedPrivate;
+       
 struct _GtkPaned
 {
   GtkContainer container;
@@ -77,7 +75,7 @@ struct _GtkPaned
 
   GtkWidget *last_child1_focus;
   GtkWidget *last_child2_focus;
-  GtkWidget *saved_focus;
+  GtkPanedPrivate *priv;
 
   gint drag_pos;
   gint original_position;
@@ -122,19 +120,21 @@ 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);
+
 /* 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
 #define        gtk_paned_gutter_size(p,s)              (void) 0
 #define        gtk_paned_set_gutter_size(p,s)          (void) 0
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GTK_PANED_H__ */