diff --git a/ChangeLog b/ChangeLog
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 46f8796c56..b70d51ae5d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Mar 19 00:37:44 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_construct): perform the
+ 	neccessary checks on funtion begin. use the scrolled_window that got
+	passed to this function, and not a new one.
+
 Wed Mar 18 11:09:10 1998  Owen Taylor  <owt1@cornell.edu>
 	( From: James Henstridge <james@daa.com.au> )
 
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 9b3488e675..c840fe03ad 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -118,13 +118,13 @@ GtkWidget*
 gtk_scrolled_window_new (GtkAdjustment *hadjustment,
 			 GtkAdjustment *vadjustment)
 {
-  GtkScrolledWindow *scrolled_window;
+  GtkWidget *scrolled_window;
 
   scrolled_window = gtk_type_new (gtk_scrolled_window_get_type ());
 
-  gtk_scrolled_window_construct (scrolled_window, hadjustment, vadjustment);
+  gtk_scrolled_window_construct (GTK_SCROLLED_WINDOW (scrolled_window), hadjustment, vadjustment);
   
-  return GTK_WIDGET (scrolled_window);
+  return scrolled_window;
 }
 
 void
@@ -132,7 +132,9 @@ gtk_scrolled_window_construct (GtkScrolledWindow *scrolled_window,
 			       GtkAdjustment     *hadjustment,
 			       GtkAdjustment     *vadjustment)
 {
-  scrolled_window = gtk_type_new (gtk_scrolled_window_get_type ());
+  g_return_if_fail (scrolled_window != NULL);
+  g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
+  g_return_if_fail (scrolled_window->viewport == NULL);
 
   scrolled_window->viewport = gtk_viewport_new (hadjustment, vadjustment);
   hadjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (scrolled_window->viewport));