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

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

diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 115dd12a6e284748ee86faaf0092a3f21e6a0f2c..003316aef73de822be9d46fc24975c896ccea343 100644 (file)
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -30,22 +30,20 @@
 
 #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)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
-#define GTK_PANED_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED, GtkPanedClass))
-#define GTK_IS_PANED(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_PANED))
-#define GTK_IS_PANED_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
-#define GTK_PANED_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PANED, GtkPanedClass))
-
+#define GTK_PANED(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED, GtkPaned))
+#define GTK_PANED_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED, GtkPanedClass))
+#define GTK_IS_PANED(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED))
+#define GTK_IS_PANED_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PANED))
+#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;
@@ -73,11 +71,13 @@ struct _GtkPaned
   guint child2_resize : 1;
   guint orientation : 1;
   guint in_recursion : 1;
+  guint handle_prelit : 1;
 
   GtkWidget *last_child1_focus;
   GtkWidget *last_child2_focus;
-  GtkWidget *saved_focus;
-  
+  GtkPanedPrivate *priv;
+
+  gint drag_pos;
   gint original_position;
 };
  
@@ -94,10 +94,16 @@ struct _GtkPanedClass
                                    gboolean       reverse);
   gboolean (* accept_position)     (GtkPaned     *paned);
   gboolean (* cancel_position)     (GtkPaned     *paned);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
-GtkType gtk_paned_get_type        (void) G_GNUC_CONST;
+GType   gtk_paned_get_type        (void) G_GNUC_CONST;
 void    gtk_paned_add1            (GtkPaned  *paned,
                                   GtkWidget *child);
 void    gtk_paned_add2            (GtkPaned  *paned,
@@ -114,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__ */