diff options
author | Tim Janik <timj@gtk.org> | 1998-03-18 23:49:36 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1998-03-18 23:49:36 +0000 |
commit | 3c03a6787d7c10bc47e76852dfbad74372d4f460 (patch) | |
tree | 1079921e2783765fd9d300e54ae189e8cf4a5815 | |
parent | f9739e834376121d8f766072499126e1cac2f332 (diff) | |
download | gdk-pixbuf-3c03a6787d7c10bc47e76852dfbad74372d4f460.tar.gz |
perform the neccessary checks on funtion begin. use the scrolled_window
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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/gtkscrolledwindow.c | 10 |
8 files changed, 48 insertions, 4 deletions
@@ -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 46f8796c5..b70d51ae5 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 46f8796c5..b70d51ae5 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 46f8796c5..b70d51ae5 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 46f8796c5..b70d51ae5 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 46f8796c5..b70d51ae5 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 46f8796c5..b70d51ae5 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 9b3488e67..c840fe03a 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)); |