summaryrefslogtreecommitdiff
path: root/gtk/gtkscrolledwindow.c
diff options
context:
space:
mode:
authorOwen Taylor <owt1@cornell.edu>1998-03-18 21:11:04 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-03-18 21:11:04 +0000
commitf9739e834376121d8f766072499126e1cac2f332 (patch)
treedb18acfaf13950986d1f9098980326cfabfb1d5a /gtk/gtkscrolledwindow.c
parent85d4cd0f43c29fcca9c38282d7fa169bf775409e (diff)
downloadgdk-pixbuf-f9739e834376121d8f766072499126e1cac2f332.tar.gz
( From: James Henstridge <james@daa.com.au> )
Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu> ( From: James Henstridge <james@daa.com.au> ) * gtk/gtkclist.c: Don't remove, then destroy labels in gtk_clist_set_column_[*], just remove them. * gtk/gtkmain.c (gtk_invoke_timeout_function): call marshal when appropriate, not function. Tue Mar 17 14:15:07 1998 Owen Taylor <owt1@cornell.edu> * gtk/testgtk.c (create_main_window): Alphabetize tests * gtk/gtk[hv]paned.c: Change division on resize if necessary to keep handle visible. * gtk/gtkgamma.c gtk/gtkcurve.c: Moved initialization into _init() functions. * gtk/gtkscrolledwindow.c: Added missing _construct() functions.
Diffstat (limited to 'gtk/gtkscrolledwindow.c')
-rw-r--r--gtk/gtkscrolledwindow.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index f0cd16c60..9b3488e67 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -122,6 +122,18 @@ gtk_scrolled_window_new (GtkAdjustment *hadjustment,
scrolled_window = gtk_type_new (gtk_scrolled_window_get_type ());
+ gtk_scrolled_window_construct (scrolled_window, hadjustment, vadjustment);
+
+ return GTK_WIDGET (scrolled_window);
+}
+
+void
+gtk_scrolled_window_construct (GtkScrolledWindow *scrolled_window,
+ GtkAdjustment *hadjustment,
+ GtkAdjustment *vadjustment)
+{
+ scrolled_window = gtk_type_new (gtk_scrolled_window_get_type ());
+
scrolled_window->viewport = gtk_viewport_new (hadjustment, vadjustment);
hadjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (scrolled_window->viewport));
vadjustment = gtk_viewport_get_vadjustment (GTK_VIEWPORT (scrolled_window->viewport));
@@ -147,8 +159,6 @@ gtk_scrolled_window_new (GtkAdjustment *hadjustment,
gtk_widget_ref (scrolled_window->viewport);
gtk_widget_ref (scrolled_window->hscrollbar);
gtk_widget_ref (scrolled_window->vscrollbar);
-
- return GTK_WIDGET (scrolled_window);
}
GtkAdjustment*