diff options
| author | Tim Janik <timj@gtk.org> | 1998-12-02 03:40:03 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-12-02 03:40:03 +0000 |
| commit | 0d15bc6687e9a9718273a37b3d880f6526fa91ce (patch) | |
| tree | a81db6a4b796eccad75dc6b9f0ba04cb664ddebc /gtk/gtkviewport.c | |
| parent | 4ebc61c067af80a3cd24f1cfd79ec6b6be80e350 (diff) | |
| download | gdk-pixbuf-0d15bc6687e9a9718273a37b3d880f6526fa91ce.tar.gz | |
s/gtk_notebook_nth_page/gtk_notebook_get_nth_page/.
Wed Dec 2 01:39:02 1998 Tim Janik <timj@gtk.org>
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: s/gtk_notebook_nth_page/gtk_notebook_get_nth_page/.
* incremented version number to 1.1.6 and made Gtk
dependant on GLib 1.1.6.
* gtk/gtkwidget.h (struct _GtkRequisition): changed width and height
from guint16 to gint16, since sizes bigger than 32767 are not supported
anyways, and aritmethics with intermediate negative values are possible
now.
Tue Dec 1 00:00:04 1998 Tim Janik <timj@gtk.org>
* gtk/gtkscrolledwindow.c:
implementation of GTK_POLICY_NEVER functionality, added rationales
on the policy and size requisition handling at the top.
(gtk_scrolled_window_size_request):
we assume a default minimum for our child's width and height
if [hv]scrollbar_policy != GTK_POLICY_NEVER, except when the user
specified the dimension explicitely.
(gtk_scrolled_window_size_allocate):
do not show scrollbars if [hv]scrollbar_policy == GTK_POLICY_NEVER.
* gtk/gtkviewport.c (gtk_viewport_size_request): report the real
size we require (including the child).
* gtk/gtkclist.c:
(gtk_clist_size_request): report the real size required.
* gtk/gtkenums.h (enum GtkPolicyType): added GTK_POLICY_NEVER.
* gtk/gtkobject.c (gtk_object_init_type): object_type doesn't
need to be a static variable.
Mon Nov 30 22:41:25 1998 Tim Janik <timj@gtk.org>
* gtk/gtkclist.h:
* gtk/gtkclist.c:
* gtk/gtkviewport.h:
* gtk/gtkviewport.c:
* gtk/gtktext.h:
* gtk/gtktext.c:
* gtk/gtklayout.h:
* gtk/gtklayout.c:
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
s/scroll_adjustements/scroll_adjustments/
s/scroll_adjustments/set_scroll_adjustments/g
Diffstat (limited to 'gtk/gtkviewport.c')
| -rw-r--r-- | gtk/gtkviewport.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 504b8f092..80e7e6383 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -37,7 +37,7 @@ static void gtk_viewport_set_arg (GtkObject *object, static void gtk_viewport_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); -static void gtk_viewport_scroll_adjustments (GtkViewport *viewport, +static void gtk_viewport_set_scroll_adjustments (GtkViewport *viewport, GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); static void gtk_viewport_map (GtkWidget *widget); @@ -130,17 +130,17 @@ gtk_viewport_class_init (GtkViewportClass *class) widget_class->size_allocate = gtk_viewport_size_allocate; widget_class->style_set = gtk_viewport_style_set; - widget_class->scroll_adjustments_signal = - gtk_signal_new ("scroll_adjustments", + widget_class->set_scroll_adjustments_signal = + gtk_signal_new ("set_scroll_adjustments", GTK_RUN_LAST, object_class->type, - GTK_SIGNAL_OFFSET (GtkViewportClass, scroll_adjustments), + GTK_SIGNAL_OFFSET (GtkViewportClass, set_scroll_adjustments), gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); container_class->add = gtk_viewport_add; - class->scroll_adjustments = gtk_viewport_scroll_adjustments; + class->set_scroll_adjustments = gtk_viewport_set_scroll_adjustments; } static void @@ -341,9 +341,9 @@ gtk_viewport_set_vadjustment (GtkViewport *viewport, } static void -gtk_viewport_scroll_adjustments (GtkViewport *viewport, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment) +gtk_viewport_set_scroll_adjustments (GtkViewport *viewport, + GtkAdjustment *hadjustment, + GtkAdjustment *vadjustment) { if (viewport->hadjustment != hadjustment) gtk_viewport_set_hadjustment (viewport, hadjustment); @@ -636,7 +636,11 @@ gtk_viewport_size_request (GtkWidget *widget, GTK_WIDGET (widget)->style->klass->ythickness) * 2 + 5; if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) - gtk_widget_size_request (bin->child, &bin->child->requisition); + { + gtk_widget_size_request (bin->child, &bin->child->requisition); + requisition->width += bin->child->requisition.width; + requisition->height += bin->child->requisition.height; + } } static void |