Commit 3c03a678 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

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.
parent f9739e83
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
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> Wed Mar 18 11:09:10 1998 Owen Taylor <owt1@cornell.edu>
( From: James Henstridge <james@daa.com.au> ) ( From: James Henstridge <james@daa.com.au> )
......
...@@ -118,13 +118,13 @@ GtkWidget* ...@@ -118,13 +118,13 @@ GtkWidget*
gtk_scrolled_window_new (GtkAdjustment *hadjustment, gtk_scrolled_window_new (GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment) GtkAdjustment *vadjustment)
{ {
GtkScrolledWindow *scrolled_window; GtkWidget *scrolled_window;
scrolled_window = gtk_type_new (gtk_scrolled_window_get_type ()); 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 void
...@@ -132,7 +132,9 @@ gtk_scrolled_window_construct (GtkScrolledWindow *scrolled_window, ...@@ -132,7 +132,9 @@ gtk_scrolled_window_construct (GtkScrolledWindow *scrolled_window,
GtkAdjustment *hadjustment, GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment) 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); scrolled_window->viewport = gtk_viewport_new (hadjustment, vadjustment);
hadjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (scrolled_window->viewport)); hadjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (scrolled_window->viewport));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment