changed scrolled window inheritance, it inherits from GtkBin now.

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

diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index a29c7b2e94adbfab6566c2413d6f5bb0330f9ea1..df7fa653940e67e728795a1d0c6c48dc49ce1a74 100644 (file)
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -43,9 +43,8 @@ typedef struct _GtkScrolledWindowClass  GtkScrolledWindowClass;
 
 struct _GtkScrolledWindow
 {
-  GtkContainer container;
+  GtkBin container;
 
-  GtkWidget *viewport;
   GtkWidget *hscrollbar;
   GtkWidget *vscrollbar;
 
@@ -53,29 +52,38 @@ struct _GtkScrolledWindow
   guint vscrollbar_policy      : 2;
   guint hscrollbar_visible     : 1;
   guint vscrollbar_visible     : 1;
-  guint autogenerated_viewport : 1;
+  guint window_placement       : 2;
 };
 
 struct _GtkScrolledWindowClass
 {
-  GtkContainerClass parent_class;
-
+  GtkBinClass parent_class;
+  
   gint scrollbar_spacing;
 };
 
 
-GtkType        gtk_scrolled_window_get_type        (void);
-GtkWidget*     gtk_scrolled_window_new             (GtkAdjustment     *hadjustment,
-                                                   GtkAdjustment     *vadjustment);
-void           gtk_scrolled_window_construct      (GtkScrolledWindow *scrolled_window,
-                                                   GtkAdjustment     *hadjustment,
-                                                   GtkAdjustment     *vadjustment);
-GtkAdjustment* gtk_scrolled_window_get_hadjustment (GtkScrolledWindow *scrolled_window);
-GtkAdjustment* gtk_scrolled_window_get_vadjustment (GtkScrolledWindow *scrolled_window);
-void           gtk_scrolled_window_set_policy      (GtkScrolledWindow *scrolled_window,
-                                                   GtkPolicyType      hscrollbar_policy,
-                                                   GtkPolicyType      vscrollbar_policy);
-
+GtkType        gtk_scrolled_window_get_type          (void);
+GtkWidget*     gtk_scrolled_window_new               (GtkAdjustment     *hadjustment,
+                                                     GtkAdjustment     *vadjustment);
+void           gtk_scrolled_window_set_hadjustment   (GtkScrolledWindow *scrolled_window,
+                                                     GtkAdjustment     *hadjustment);
+void           gtk_scrolled_window_set_vadjustment   (GtkScrolledWindow *scrolled_window,
+                                                     GtkAdjustment     *hadjustment);
+GtkAdjustment* gtk_scrolled_window_get_hadjustment   (GtkScrolledWindow *scrolled_window);
+GtkAdjustment* gtk_scrolled_window_get_vadjustment   (GtkScrolledWindow *scrolled_window);
+void           gtk_scrolled_window_set_policy        (GtkScrolledWindow *scrolled_window,
+                                                     GtkPolicyType      hscrollbar_policy,
+                                                     GtkPolicyType      vscrollbar_policy);
+void           gtk_scrolled_window_set_placement     (GtkScrolledWindow *scrolled_window,
+                                                     GtkCornerType      window_placement);
+void          gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
+                                                     GtkWidget         *child);
+
+/* deprecated */
+void           gtk_scrolled_window_construct         (GtkScrolledWindow *scrolled_window,
+                                                     GtkAdjustment     *hadjustment,
+                                                     GtkAdjustment     *vadjustment);
 
 #ifdef __cplusplus
 }