2008-07-01 22:57:50 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
1997-11-24 22:37:52 +00:00
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1997-11-24 22:37:52 +00:00
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
2012-02-27 13:01:10 +00:00
|
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
1999-02-24 07:37:18 +00:00
|
|
|
|
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
2008-06-22 14:28:52 +00:00
|
|
|
#include "config.h"
|
2010-10-22 16:46:33 +00:00
|
|
|
|
|
|
|
#include "gtkviewport.h"
|
2010-10-29 01:28:24 +00:00
|
|
|
|
2012-03-03 18:41:55 +00:00
|
|
|
#include "gtkadjustment.h"
|
2001-03-30 15:46:17 +00:00
|
|
|
#include "gtkintl.h"
|
2001-11-17 23:28:51 +00:00
|
|
|
#include "gtkmarshalers.h"
|
2012-03-03 18:41:55 +00:00
|
|
|
#include "gtkprivate.h"
|
2010-10-18 04:21:39 +00:00
|
|
|
#include "gtkscrollable.h"
|
2011-01-04 17:05:05 +00:00
|
|
|
#include "gtktypebuiltins.h"
|
2010-07-09 17:22:23 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-03-04 18:13:45 +00:00
|
|
|
/**
|
|
|
|
* SECTION:gtkviewport
|
|
|
|
* @Short_description: An adapter which makes widgets scrollable
|
|
|
|
* @Title: GtkViewport
|
|
|
|
* @See_also:#GtkScrolledWindow, #GtkAdjustment
|
|
|
|
*
|
|
|
|
* The #GtkViewport widget acts as an adaptor class, implementing
|
|
|
|
* scrollability for child widgets that lack their own scrolling
|
|
|
|
* capabilities. Use #GtkViewport to scroll child widgets such as
|
2011-09-29 11:36:39 +00:00
|
|
|
* #GtkGrid, #GtkBox, and so on.
|
2010-03-04 18:13:45 +00:00
|
|
|
*
|
|
|
|
* If a widget has native scrolling abilities, such as #GtkTextView,
|
2012-07-02 06:19:06 +00:00
|
|
|
* #GtkTreeView or #GtkIconView, it can be added to a #GtkScrolledWindow
|
2010-03-04 18:13:45 +00:00
|
|
|
* with gtk_container_add(). If a widget does not, you must first add the
|
|
|
|
* widget to a #GtkViewport, then add the viewport to the scrolled window.
|
2013-02-01 16:03:44 +00:00
|
|
|
* gtk_container_add() does this automatically if a child that does not
|
|
|
|
* implement #GtkScrollable is added to a #GtkScrolledWindow, so you can
|
|
|
|
* ignore the presence of the viewport.
|
2010-09-22 03:48:37 +00:00
|
|
|
*
|
|
|
|
* The #GtkViewport will start scrolling content only if allocated less
|
|
|
|
* than the child widget's minimum size in a given orientation.
|
2010-03-04 18:13:45 +00:00
|
|
|
*/
|
|
|
|
|
2010-08-26 17:15:37 +00:00
|
|
|
struct _GtkViewportPrivate
|
2010-07-13 21:20:38 +00:00
|
|
|
{
|
|
|
|
GtkAdjustment *hadjustment;
|
|
|
|
GtkAdjustment *vadjustment;
|
|
|
|
GtkShadowType shadow_type;
|
|
|
|
|
|
|
|
GdkWindow *bin_window;
|
|
|
|
GdkWindow *view_window;
|
2010-10-26 00:59:02 +00:00
|
|
|
|
|
|
|
/* GtkScrollablePolicy needs to be checked when
|
|
|
|
* driving the scrollable adjustment values */
|
|
|
|
guint hscroll_policy : 1;
|
|
|
|
guint vscroll_policy : 1;
|
2010-07-13 21:20:38 +00:00
|
|
|
};
|
|
|
|
|
1998-07-16 02:47:15 +00:00
|
|
|
enum {
|
2001-03-30 15:46:17 +00:00
|
|
|
PROP_0,
|
|
|
|
PROP_HADJUSTMENT,
|
|
|
|
PROP_VADJUSTMENT,
|
2010-10-26 00:59:02 +00:00
|
|
|
PROP_HSCROLL_POLICY,
|
|
|
|
PROP_VSCROLL_POLICY,
|
2001-03-30 15:46:17 +00:00
|
|
|
PROP_SHADOW_TYPE
|
1998-07-16 02:47:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-03-30 15:46:17 +00:00
|
|
|
static void gtk_viewport_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec);
|
|
|
|
static void gtk_viewport_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec);
|
2010-09-18 23:55:42 +00:00
|
|
|
static void gtk_viewport_destroy (GtkWidget *widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
static void gtk_viewport_realize (GtkWidget *widget);
|
|
|
|
static void gtk_viewport_unrealize (GtkWidget *widget);
|
2010-09-07 14:56:46 +00:00
|
|
|
static gint gtk_viewport_draw (GtkWidget *widget,
|
|
|
|
cairo_t *cr);
|
1998-01-18 15:09:10 +00:00
|
|
|
static void gtk_viewport_add (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
static void gtk_viewport_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
|
|
|
static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
|
|
|
|
gpointer data);
|
2011-01-10 02:38:35 +00:00
|
|
|
static void gtk_viewport_style_updated (GtkWidget *widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-09-21 14:35:17 +00:00
|
|
|
static void gtk_viewport_get_preferred_width (GtkWidget *widget,
|
|
|
|
gint *minimum_size,
|
|
|
|
gint *natural_size);
|
|
|
|
static void gtk_viewport_get_preferred_height (GtkWidget *widget,
|
|
|
|
gint *minimum_size,
|
|
|
|
gint *natural_size);
|
2010-04-13 02:21:46 +00:00
|
|
|
|
2011-11-16 23:24:15 +00:00
|
|
|
static void viewport_set_adjustment (GtkViewport *viewport,
|
|
|
|
GtkOrientation orientation,
|
|
|
|
GtkAdjustment *adjustment);
|
2010-04-06 21:15:50 +00:00
|
|
|
|
2010-10-18 04:21:39 +00:00
|
|
|
G_DEFINE_TYPE_WITH_CODE (GtkViewport, gtk_viewport, GTK_TYPE_BIN,
|
|
|
|
G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_viewport_class_init (GtkViewportClass *class)
|
|
|
|
{
|
2001-03-30 15:46:17 +00:00
|
|
|
GObjectClass *gobject_class;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
GtkContainerClass *container_class;
|
|
|
|
|
2001-03-30 15:46:17 +00:00
|
|
|
gobject_class = G_OBJECT_CLASS (class);
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
container_class = (GtkContainerClass*) class;
|
2002-10-09 00:38:22 +00:00
|
|
|
|
2001-03-30 15:46:17 +00:00
|
|
|
gobject_class->set_property = gtk_viewport_set_property;
|
|
|
|
gobject_class->get_property = gtk_viewport_get_property;
|
2010-09-18 23:55:42 +00:00
|
|
|
|
|
|
|
widget_class->destroy = gtk_viewport_destroy;
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class->realize = gtk_viewport_realize;
|
|
|
|
widget_class->unrealize = gtk_viewport_unrealize;
|
2010-09-07 14:56:46 +00:00
|
|
|
widget_class->draw = gtk_viewport_draw;
|
1997-11-24 22:37:52 +00:00
|
|
|
widget_class->size_allocate = gtk_viewport_size_allocate;
|
2011-01-10 02:38:35 +00:00
|
|
|
widget_class->style_updated = gtk_viewport_style_updated;
|
2010-09-21 14:35:17 +00:00
|
|
|
widget_class->get_preferred_width = gtk_viewport_get_preferred_width;
|
|
|
|
widget_class->get_preferred_height = gtk_viewport_get_preferred_height;
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
|
2011-07-18 16:11:10 +00:00
|
|
|
gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_VIEWPORT);
|
|
|
|
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
container_class->add = gtk_viewport_add;
|
|
|
|
|
2010-10-18 04:21:39 +00:00
|
|
|
/* GtkScrollable implementation */
|
2010-10-26 00:59:02 +00:00
|
|
|
g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment");
|
|
|
|
g_object_class_override_property (gobject_class, PROP_VADJUSTMENT, "vadjustment");
|
|
|
|
g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy");
|
|
|
|
g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy");
|
2001-03-30 15:46:17 +00:00
|
|
|
|
|
|
|
g_object_class_install_property (gobject_class,
|
|
|
|
PROP_SHADOW_TYPE,
|
2005-03-09 06:15:13 +00:00
|
|
|
g_param_spec_enum ("shadow-type",
|
2004-01-16 23:10:05 +00:00
|
|
|
P_("Shadow type"),
|
|
|
|
P_("Determines how the shadowed box around the viewport is drawn"),
|
2001-03-30 15:46:17 +00:00
|
|
|
GTK_TYPE_SHADOW_TYPE,
|
|
|
|
GTK_SHADOW_IN,
|
2005-03-22 02:14:55 +00:00
|
|
|
GTK_PARAM_READWRITE));
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
|
2010-08-26 17:15:37 +00:00
|
|
|
g_type_class_add_private (class, sizeof (GtkViewportPrivate));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-07-16 02:47:15 +00:00
|
|
|
static void
|
2001-03-30 15:46:17 +00:00
|
|
|
gtk_viewport_set_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
const GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-07-16 02:47:15 +00:00
|
|
|
{
|
|
|
|
GtkViewport *viewport;
|
|
|
|
|
|
|
|
viewport = GTK_VIEWPORT (object);
|
|
|
|
|
2001-03-30 15:46:17 +00:00
|
|
|
switch (prop_id)
|
1998-07-16 02:47:15 +00:00
|
|
|
{
|
2001-03-30 15:46:17 +00:00
|
|
|
case PROP_HADJUSTMENT:
|
2011-11-16 23:27:35 +00:00
|
|
|
viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, g_value_get_object (value));
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
2001-03-30 15:46:17 +00:00
|
|
|
case PROP_VADJUSTMENT:
|
2011-11-16 23:27:35 +00:00
|
|
|
viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, g_value_get_object (value));
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
2010-10-26 00:59:02 +00:00
|
|
|
case PROP_HSCROLL_POLICY:
|
|
|
|
viewport->priv->hscroll_policy = g_value_get_enum (value);
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (viewport));
|
|
|
|
break;
|
|
|
|
case PROP_VSCROLL_POLICY:
|
|
|
|
viewport->priv->vscroll_policy = g_value_get_enum (value);
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (viewport));
|
|
|
|
break;
|
2001-03-30 15:46:17 +00:00
|
|
|
case PROP_SHADOW_TYPE:
|
|
|
|
gtk_viewport_set_shadow_type (viewport, g_value_get_enum (value));
|
1998-09-26 03:12:03 +00:00
|
|
|
break;
|
1998-07-16 02:47:15 +00:00
|
|
|
default:
|
2001-03-30 15:46:17 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-03-30 15:46:17 +00:00
|
|
|
gtk_viewport_get_property (GObject *object,
|
|
|
|
guint prop_id,
|
|
|
|
GValue *value,
|
|
|
|
GParamSpec *pspec)
|
1998-07-16 02:47:15 +00:00
|
|
|
{
|
2010-07-13 21:20:38 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (object);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
1998-07-16 02:47:15 +00:00
|
|
|
|
2001-03-30 15:46:17 +00:00
|
|
|
switch (prop_id)
|
1998-07-16 02:47:15 +00:00
|
|
|
{
|
2001-03-30 15:46:17 +00:00
|
|
|
case PROP_HADJUSTMENT:
|
2010-07-13 21:20:38 +00:00
|
|
|
g_value_set_object (value, priv->hadjustment);
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
2001-03-30 15:46:17 +00:00
|
|
|
case PROP_VADJUSTMENT:
|
2010-07-13 21:20:38 +00:00
|
|
|
g_value_set_object (value, priv->vadjustment);
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
2010-10-26 00:59:02 +00:00
|
|
|
case PROP_HSCROLL_POLICY:
|
|
|
|
g_value_set_enum (value, priv->hscroll_policy);
|
|
|
|
break;
|
|
|
|
case PROP_VSCROLL_POLICY:
|
|
|
|
g_value_set_enum (value, priv->vscroll_policy);
|
|
|
|
break;
|
2001-03-30 15:46:17 +00:00
|
|
|
case PROP_SHADOW_TYPE:
|
2010-07-13 21:20:38 +00:00
|
|
|
g_value_set_enum (value, priv->shadow_type);
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
|
|
|
default:
|
2001-03-30 15:46:17 +00:00
|
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
1998-07-16 02:47:15 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_viewport_init (GtkViewport *viewport)
|
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv;
|
2010-07-13 21:20:38 +00:00
|
|
|
|
|
|
|
viewport->priv = G_TYPE_INSTANCE_GET_PRIVATE (viewport,
|
|
|
|
GTK_TYPE_VIEWPORT,
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate);
|
2010-07-13 21:20:38 +00:00
|
|
|
priv = viewport->priv;
|
|
|
|
|
2010-03-06 10:29:31 +00:00
|
|
|
gtk_widget_set_has_window (GTK_WIDGET (viewport), TRUE);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2001-11-15 21:04:51 +00:00
|
|
|
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (viewport), FALSE);
|
2010-07-13 21:20:38 +00:00
|
|
|
|
|
|
|
priv->shadow_type = GTK_SHADOW_IN;
|
|
|
|
priv->view_window = NULL;
|
|
|
|
priv->bin_window = NULL;
|
|
|
|
priv->hadjustment = NULL;
|
|
|
|
priv->vadjustment = NULL;
|
2011-11-16 23:24:15 +00:00
|
|
|
|
|
|
|
viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, NULL);
|
|
|
|
viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 21:50:36 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_new:
|
2011-09-26 00:58:59 +00:00
|
|
|
* @hadjustment: horizontal adjustment
|
|
|
|
* @vadjustment: vertical adjustment
|
2001-12-10 21:50:36 +00:00
|
|
|
*
|
|
|
|
* Creates a new #GtkViewport with the given adjustments.
|
|
|
|
*
|
2011-09-26 00:58:59 +00:00
|
|
|
* Returns: a new #GtkViewport
|
|
|
|
*/
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkWidget*
|
|
|
|
gtk_viewport_new (GtkAdjustment *hadjustment,
|
|
|
|
GtkAdjustment *vadjustment)
|
|
|
|
{
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
GtkWidget *viewport;
|
|
|
|
|
Use g_object_new instead of gtk_widget_new
2008-06-19 Johan Dahlin <jdahlin@async.com.br>
* demos/testpixbuf.c (new_testrgb_window):
* gtk/gtkctree.c (gtk_ctree_new_with_titles):
* gtk/gtkitemfactory.c (gtk_item_factory_construct),
(gtk_item_factory_create_item):
* gtk/gtkmenu.c (gtk_menu_set_tearoff_state):
* gtk/gtkprogressbar.c (gtk_progress_bar_new),
(gtk_progress_bar_new_with_adjustment):
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_new):
* gtk/gtktext.c (gtk_text_new):
* gtk/gtkviewport.c (gtk_viewport_new):
* tests/simple.c (main):
* tests/testgtk.c (create_statusbar), (create_get_image),
(create_saved_position), (create_tooltips), (create_cursors),
(create_display_screen), (create_progress_bar), (create_idle_test):
* tests/testmultidisplay.c (make_selection_dialog), (main):
* tests/testmultiscreen.c (main):
* tests/testrgb.c (new_testrgb_window):
Use g_object_new instead of gtk_widget_new
svn path=/trunk/; revision=20462
2008-06-19 12:25:19 +00:00
|
|
|
viewport = g_object_new (GTK_TYPE_VIEWPORT,
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
"hadjustment", hadjustment,
|
|
|
|
"vadjustment", vadjustment,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
return viewport;
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
#define ADJUSTMENT_POINTER(viewport, orientation) \
|
|
|
|
(((orientation) == GTK_ORIENTATION_HORIZONTAL) ? \
|
2010-07-13 21:20:38 +00:00
|
|
|
&(viewport)->priv->hadjustment : &(viewport)->priv->vadjustment)
|
2003-06-06 23:08:14 +00:00
|
|
|
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
static void
|
2003-06-06 23:08:14 +00:00
|
|
|
viewport_disconnect_adjustment (GtkViewport *viewport,
|
|
|
|
GtkOrientation orientation)
|
added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org>
* gtk/gtkprogress.c: added args ::show_text, ::text_xalign,
::text_yalign, ::activity_mode.
* gtk/gtkprogressbar.c: added construct arg ::adjustment. added args
::bar_style, ::orientation, ::discrete_blocks, ::activity_step,
::activity_blocks.
(gtk_progress_bar_new):
(gtk_progress_bar_new_with_adjustment): use gtk_widget_new().
(gtk_progress_bar_construct): deprecated.
* gtk/gtkvscrollbar.c:
(gtk_vscrollbar_draw_step_back):
(gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for
gtk_paint_arrow, to be consistent with hscrollbar.
* gtk/gtktext.c
added construct args ::hadjustment, ::vadjustment.
added args ::line_wrap, ::word_wrap.
(gtk_text_class_init): added scroll_adjustments signal.
(gtk_text_new): use gtk_widget_new.
(gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments,
so we don't screw the reference counts and don't leave signals connected.
(gtk_text_destroy): disconnect adjustments signals.
(gtk_text_finalize): unref adjustments.
* gtk/gtkctree.c: added construct args ::n_columns and ::tree_column.
added args ::indent, ::spacing, ::show_stub, ::reorderable,
::use_drag_icons, ::line_style and ::expander_style.
(gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is
deprecated now.
* gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag.
* gtk/gtkclist.c:
removed ::vadjustment and ::hadjustment args, introduced
::scroll_adjustments signal.
added ::shadow_type, ::selection_mode and ::row_height args.
added n_columns construct arg.
(gtk_clist_construct): call gtk_object_constructed().
(gtk_clist_set_row_height): if height is passed as 0,
revert to automatic height calculation.
(gtk_clist_destroy): before unrefing the adjustments, disconnect our
signal handlers.
Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct
like gtk_object_new.
(gtk_widget_destroy): assert that we only destroy constructed widgets.
* gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY
to identify args that may only be used for construction.
GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction
time.
* gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct
at the end if the object is not fully constructed.
(gtk_object_newv): likewise.
(gtk_object_destroy): assert that we only destroy constructed objects.
(gtk_object_init): setup GTK_CONSTRUCTED from the
objects real klass.
(gtk_object_default_construct): new function to complete default
construction of an object by applying missing construtor args with
default values of 0, 0.0 or NULL.
(gtk_object_constructed): new function to mark an object as being
constructed (used from within constructors).
* gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer
so it is immediatedly available for the caller.
* gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to
the object initilizer (GtkObjectInitFunc takes a second arg now, the
real klass), and asure that object initializers may temporarily alter
the class pointer.
Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c: change all occourances of gtk_container_add (
scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...)
for widget!=(clist, ctree, text, viewport).
* gtk/gtkcombo.c:
(gtk_combo_init): use gtk_scrolled_window_add_with_viewport()
to add children to the scrolled window.
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c:
changed scrolled_window->viewport to scrolled_window->child, and use
gtk_widget_scroll_adjustements() to set the scroll adjustments for the
widget, we do not create an additional viewport anymore.
added ::hadjustment and ::vadjustment constructor args.
(gtk_scrolled_window_new): use gtk_widget_new() to create the widget.
(gtk_scrolled_window_set_hadjustment):
(gtk_scrolled_window_set_vadjustment): new functions that superceed
gtk_scrolled_window_construct.
(gtk_scrolled_window_construct): deprecated this function.
* gtk/gtkhscrollbar.c:
* gtk/gtkvscrollbar.c:
* gtk/gtkhscale.c:
* gtk/gtkvscale.c:
support a constructor arg "::adjustment", and use gtk_widget_new() for
the widget creation.
* gtk/gtkrange.c: added ::update_policy arg.
(gtk_range_set_adjustment): if adjustment is passed in as NULL, create
a default adjustment so this function can be used for derived widgets
that depend on the adjustment's existance.
(gtk_range_destroy): disconnect the adjustment signal, so we don't
get called after we got destroyed, we don't destroy the adjustment
in here, because it might have been provided from another widget.
* gtk/gtkviewport.c: introduced ::scroll_adjustments signal.
(gtk_viewport_destroy): same as gtk_range_destroy.
* gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: changed gtk_widget_activate() to return a
gboolean, indicating whether this widget supports activation.
added gtk_widget_scroll_adjustements() to set the scrolling
adjustments of a widget.
Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkoptionmenu.c:
(gtk_option_menu_remove_contents):
(gtk_option_menu_update_contents): removed
gtk_container_[un]block_resize() pairs.
* gtk/gtknotebook.h:
* gtk/gtknotebook.c: removed the tab_border field, since it shouldn't
be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a
wrtie-only argument.
* *.c: made deprecated functions issue a message:
gtk_clist_set_border, gtk_container_block_resize,
gtk_container_unblock_resize, gtk_container_need_resize,
gtk_object_class_add_user_signal, gtk_spin_button_construct,
gtk_scrolled_window_construct.
removed non-functional functions:
gtk_container_disable_resize, gtk_container_enable_resize,
gtk_clist_set_policy.
Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbox.c (gtk_box_init):
* gtk/gtkdrawingarea.c (gtk_drawing_area_init):
* gtk/gtkeventbox.c (gtk_event_box_init):
* gtk/gtkfixed.c (gtk_fixed_init):
* gtk/gtkframe.c (gtk_frame_init):
* gtk/gtkhandlebox.c (gtk_handle_box_init):
* gtk/gtkpacker.c (gtk_packer_init):
* gtk/gtkmisc.c (gtk_misc_init):
* gtk/gtkpreview.c (gtk_preview_init):
* gtk/gtkprogress.c (gtk_progress_init):
* gtk/gtkprogressbar.c (gtk_progress_bar_init):
* gtk/gtkseparator.c (gtk_separator_init):
* gtk/gtktable.c (gtk_table_init):
* gtk/gtkviewport.c (gtk_viewport_init):
* gtk/gtkalignment.c (gtk_alignment_init):
removed setting of the GTK_BASIC flag.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c:
removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic.
* miscellaneous GtkType and macro fixups.
1998-11-23 01:54:45 +00:00
|
|
|
{
|
2003-06-06 23:08:14 +00:00
|
|
|
GtkAdjustment **adjustmentp = ADJUSTMENT_POINTER (viewport, orientation);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
if (*adjustmentp)
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
{
|
2003-06-06 23:08:14 +00:00
|
|
|
g_signal_handlers_disconnect_by_func (*adjustmentp,
|
2002-10-09 00:38:22 +00:00
|
|
|
gtk_viewport_adjustment_value_changed,
|
|
|
|
viewport);
|
2003-06-06 23:08:14 +00:00
|
|
|
g_object_unref (*adjustmentp);
|
|
|
|
*adjustmentp = NULL;
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
}
|
2003-06-06 23:08:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-09-18 23:55:42 +00:00
|
|
|
gtk_viewport_destroy (GtkWidget *widget)
|
2003-06-06 23:08:14 +00:00
|
|
|
{
|
2010-09-18 23:55:42 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
2003-06-06 23:08:14 +00:00
|
|
|
|
|
|
|
viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL);
|
|
|
|
viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL);
|
1998-01-30 23:47:09 +00:00
|
|
|
|
2010-09-18 23:55:42 +00:00
|
|
|
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->destroy (widget);
|
1998-01-30 23:47:09 +00:00
|
|
|
}
|
|
|
|
|
2010-10-22 16:46:33 +00:00
|
|
|
static void
|
|
|
|
viewport_get_view_allocation (GtkViewport *viewport,
|
|
|
|
GtkAllocation *view_allocation)
|
|
|
|
{
|
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
|
|
|
GtkWidget *widget = GTK_WIDGET (viewport);
|
|
|
|
GtkAllocation allocation;
|
2011-01-10 02:38:35 +00:00
|
|
|
GtkStyleContext *context;
|
|
|
|
GtkStateFlags state;
|
|
|
|
GtkBorder padding, border;
|
2010-10-22 16:46:33 +00:00
|
|
|
guint border_width;
|
|
|
|
|
|
|
|
gtk_widget_get_allocation (widget, &allocation);
|
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (viewport));
|
|
|
|
|
|
|
|
view_allocation->x = 0;
|
|
|
|
view_allocation->y = 0;
|
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
context = gtk_widget_get_style_context (widget);
|
|
|
|
state = gtk_widget_get_state_flags (widget);
|
2012-02-09 15:36:46 +00:00
|
|
|
gtk_style_context_save (context);
|
|
|
|
gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
|
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
gtk_style_context_get_padding (context, state, &padding);
|
|
|
|
gtk_style_context_get_border (context, state, &border);
|
|
|
|
|
2012-02-09 15:36:46 +00:00
|
|
|
gtk_style_context_restore (context);
|
|
|
|
|
2010-10-22 16:46:33 +00:00
|
|
|
if (priv->shadow_type != GTK_SHADOW_NONE)
|
|
|
|
{
|
2011-01-10 02:38:35 +00:00
|
|
|
view_allocation->x = border.left;
|
|
|
|
view_allocation->y = border.top;
|
2010-10-22 16:46:33 +00:00
|
|
|
}
|
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
view_allocation->x += padding.left;
|
2012-02-20 11:11:18 +00:00
|
|
|
view_allocation->y += padding.top;
|
2011-01-10 02:38:35 +00:00
|
|
|
view_allocation->width = MAX (1, allocation.width - padding.left - padding.right - border_width * 2);
|
|
|
|
view_allocation->height = MAX (1, allocation.height - padding.top - padding.bottom - border_width * 2);
|
|
|
|
|
|
|
|
if (priv->shadow_type != GTK_SHADOW_NONE)
|
|
|
|
{
|
|
|
|
view_allocation->width = MAX (1, view_allocation->width - border.left - border.right);
|
|
|
|
view_allocation->height = MAX (1, view_allocation->height - border.top - border.bottom);
|
|
|
|
}
|
2010-10-22 16:46:33 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 21:50:36 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_get_hadjustment:
|
|
|
|
* @viewport: a #GtkViewport.
|
2010-09-21 04:18:11 +00:00
|
|
|
*
|
2001-12-10 21:50:36 +00:00
|
|
|
* Returns the horizontal adjustment of the viewport.
|
|
|
|
*
|
2010-09-21 04:18:11 +00:00
|
|
|
* Return value: (transfer none): the horizontal adjustment of @viewport.
|
2010-10-18 04:21:39 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 3.0: Use gtk_scrollable_get_hadjustment()
|
2001-12-10 21:50:36 +00:00
|
|
|
**/
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkAdjustment*
|
|
|
|
gtk_viewport_get_hadjustment (GtkViewport *viewport)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
|
|
|
|
|
2011-11-16 23:25:15 +00:00
|
|
|
return viewport->priv->hadjustment;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 21:50:36 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_get_vadjustment:
|
|
|
|
* @viewport: a #GtkViewport.
|
|
|
|
*
|
|
|
|
* Returns the vertical adjustment of the viewport.
|
|
|
|
*
|
2010-09-21 04:18:11 +00:00
|
|
|
* Return value: (transfer none): the vertical adjustment of @viewport.
|
2010-10-18 04:21:39 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 3.0: Use gtk_scrollable_get_vadjustment()
|
2001-12-10 21:50:36 +00:00
|
|
|
**/
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkAdjustment*
|
|
|
|
gtk_viewport_get_vadjustment (GtkViewport *viewport)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
|
|
|
|
|
2011-11-16 23:25:15 +00:00
|
|
|
return viewport->priv->vadjustment;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
static void
|
2011-01-05 20:53:04 +00:00
|
|
|
viewport_set_hadjustment_values (GtkViewport *viewport)
|
2003-06-06 23:08:14 +00:00
|
|
|
{
|
|
|
|
GtkBin *bin = GTK_BIN (viewport);
|
|
|
|
GtkAllocation view_allocation;
|
2011-11-16 23:29:30 +00:00
|
|
|
GtkAdjustment *hadjustment = viewport->priv->hadjustment;
|
2010-05-24 20:31:36 +00:00
|
|
|
GtkWidget *child;
|
2011-01-05 20:53:04 +00:00
|
|
|
gdouble upper, value;
|
2003-12-05 23:31:51 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
viewport_get_view_allocation (viewport, &view_allocation);
|
|
|
|
|
2010-05-24 20:31:36 +00:00
|
|
|
child = gtk_bin_get_child (bin);
|
|
|
|
if (child && gtk_widget_get_visible (child))
|
2003-06-06 23:08:14 +00:00
|
|
|
{
|
2010-10-26 00:59:02 +00:00
|
|
|
gint minimum_width, natural_width;
|
|
|
|
gint scroll_height;
|
|
|
|
|
|
|
|
if (viewport->priv->vscroll_policy == GTK_SCROLL_MINIMUM)
|
|
|
|
gtk_widget_get_preferred_height (child, &scroll_height, NULL);
|
|
|
|
else
|
|
|
|
gtk_widget_get_preferred_height (child, NULL, &scroll_height);
|
2010-09-09 13:35:58 +00:00
|
|
|
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_widget_get_preferred_width_for_height (child,
|
2010-10-26 00:59:02 +00:00
|
|
|
MAX (view_allocation.height, scroll_height),
|
2010-09-21 14:35:17 +00:00
|
|
|
&minimum_width,
|
2010-10-26 00:59:02 +00:00
|
|
|
&natural_width);
|
|
|
|
|
|
|
|
if (viewport->priv->hscroll_policy == GTK_SCROLL_MINIMUM)
|
2011-01-05 20:53:04 +00:00
|
|
|
upper = MAX (minimum_width, view_allocation.width);
|
2010-10-26 00:59:02 +00:00
|
|
|
else
|
2011-01-05 20:53:04 +00:00
|
|
|
upper = MAX (natural_width, view_allocation.width);
|
2003-06-06 23:08:14 +00:00
|
|
|
}
|
|
|
|
else
|
2011-01-05 20:53:04 +00:00
|
|
|
upper = view_allocation.width;
|
2003-06-06 23:08:14 +00:00
|
|
|
|
2011-01-05 20:53:04 +00:00
|
|
|
value = gtk_adjustment_get_value (hadjustment);
|
|
|
|
/* We clamp to the left in RTL mode */
|
|
|
|
if (gtk_widget_get_direction (GTK_WIDGET (viewport)) == GTK_TEXT_DIR_RTL)
|
2003-12-05 23:31:51 +00:00
|
|
|
{
|
2011-01-05 20:53:04 +00:00
|
|
|
gdouble dist = gtk_adjustment_get_upper (hadjustment)
|
|
|
|
- value
|
|
|
|
- gtk_adjustment_get_page_size (hadjustment);
|
|
|
|
value = upper - dist - view_allocation.width;
|
2003-12-05 23:31:51 +00:00
|
|
|
}
|
2011-01-05 20:53:04 +00:00
|
|
|
|
|
|
|
gtk_adjustment_configure (hadjustment,
|
|
|
|
value,
|
|
|
|
0,
|
|
|
|
upper,
|
|
|
|
view_allocation.width * 0.1,
|
|
|
|
view_allocation.width * 0.9,
|
|
|
|
view_allocation.width);
|
2003-06-06 23:08:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2011-01-05 20:53:04 +00:00
|
|
|
viewport_set_vadjustment_values (GtkViewport *viewport)
|
2003-06-06 23:08:14 +00:00
|
|
|
{
|
|
|
|
GtkBin *bin = GTK_BIN (viewport);
|
|
|
|
GtkAllocation view_allocation;
|
2011-11-16 23:29:30 +00:00
|
|
|
GtkAdjustment *vadjustment = viewport->priv->vadjustment;
|
2010-05-24 20:31:36 +00:00
|
|
|
GtkWidget *child;
|
2011-01-05 20:53:04 +00:00
|
|
|
gdouble upper;
|
2003-06-06 23:08:14 +00:00
|
|
|
|
|
|
|
viewport_get_view_allocation (viewport, &view_allocation);
|
|
|
|
|
2010-05-24 20:31:36 +00:00
|
|
|
child = gtk_bin_get_child (bin);
|
|
|
|
if (child && gtk_widget_get_visible (child))
|
2003-06-06 23:08:14 +00:00
|
|
|
{
|
2010-10-26 00:59:02 +00:00
|
|
|
gint minimum_height, natural_height;
|
|
|
|
gint scroll_width;
|
|
|
|
|
|
|
|
if (viewport->priv->hscroll_policy == GTK_SCROLL_MINIMUM)
|
|
|
|
gtk_widget_get_preferred_width (child, &scroll_width, NULL);
|
|
|
|
else
|
|
|
|
gtk_widget_get_preferred_width (child, NULL, &scroll_width);
|
2010-05-24 20:31:36 +00:00
|
|
|
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_widget_get_preferred_height_for_width (child,
|
2010-10-26 00:59:02 +00:00
|
|
|
MAX (view_allocation.width, scroll_width),
|
2010-09-21 14:35:17 +00:00
|
|
|
&minimum_height,
|
2010-10-26 00:59:02 +00:00
|
|
|
&natural_height);
|
2010-09-22 03:48:37 +00:00
|
|
|
|
2010-10-26 00:59:02 +00:00
|
|
|
if (viewport->priv->vscroll_policy == GTK_SCROLL_MINIMUM)
|
2011-01-05 20:53:04 +00:00
|
|
|
upper = MAX (minimum_height, view_allocation.height);
|
2010-10-26 00:59:02 +00:00
|
|
|
else
|
2011-01-05 20:53:04 +00:00
|
|
|
upper = MAX (natural_height, view_allocation.height);
|
2003-06-06 23:08:14 +00:00
|
|
|
}
|
|
|
|
else
|
2011-01-05 20:53:04 +00:00
|
|
|
upper = view_allocation.height;
|
|
|
|
|
|
|
|
gtk_adjustment_configure (vadjustment,
|
|
|
|
gtk_adjustment_get_value (vadjustment),
|
|
|
|
0,
|
|
|
|
upper,
|
|
|
|
view_allocation.height * 0.1,
|
|
|
|
view_allocation.height * 0.9,
|
|
|
|
view_allocation.height);
|
2003-06-06 23:08:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
viewport_set_adjustment (GtkViewport *viewport,
|
|
|
|
GtkOrientation orientation,
|
|
|
|
GtkAdjustment *adjustment)
|
|
|
|
{
|
|
|
|
GtkAdjustment **adjustmentp = ADJUSTMENT_POINTER (viewport, orientation);
|
|
|
|
|
2003-06-08 15:34:30 +00:00
|
|
|
if (adjustment && adjustment == *adjustmentp)
|
2003-06-06 23:08:14 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (!adjustment)
|
2010-09-27 13:10:12 +00:00
|
|
|
adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
|
2006-01-06 14:07:24 +00:00
|
|
|
viewport_disconnect_adjustment (viewport, orientation);
|
2003-06-06 23:08:14 +00:00
|
|
|
*adjustmentp = adjustment;
|
2005-11-23 18:06:58 +00:00
|
|
|
g_object_ref_sink (adjustment);
|
2003-06-06 23:08:14 +00:00
|
|
|
|
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2011-01-05 20:53:04 +00:00
|
|
|
viewport_set_hadjustment_values (viewport);
|
2003-06-06 23:08:14 +00:00
|
|
|
else
|
2011-01-05 20:53:04 +00:00
|
|
|
viewport_set_vadjustment_values (viewport);
|
2003-06-06 23:08:14 +00:00
|
|
|
|
2008-08-08 13:25:18 +00:00
|
|
|
g_signal_connect (adjustment, "value-changed",
|
2003-06-06 23:08:14 +00:00
|
|
|
G_CALLBACK (gtk_viewport_adjustment_value_changed),
|
|
|
|
viewport);
|
|
|
|
|
2011-01-05 20:53:04 +00:00
|
|
|
gtk_viewport_adjustment_value_changed (adjustment, viewport);
|
2003-06-06 23:08:14 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 21:50:36 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_set_hadjustment:
|
|
|
|
* @viewport: a #GtkViewport.
|
2009-12-10 10:23:40 +00:00
|
|
|
* @adjustment: (allow-none): a #GtkAdjustment.
|
|
|
|
*
|
2001-12-10 21:50:36 +00:00
|
|
|
* Sets the horizontal adjustment of the viewport.
|
2010-10-18 04:21:39 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 3.0: Use gtk_scrollable_set_hadjustment()
|
2001-12-10 21:50:36 +00:00
|
|
|
**/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_viewport_set_hadjustment (GtkViewport *viewport,
|
|
|
|
GtkAdjustment *adjustment)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
|
1998-11-05 15:44:22 +00:00
|
|
|
if (adjustment)
|
|
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, adjustment);
|
2001-03-30 15:46:17 +00:00
|
|
|
|
|
|
|
g_object_notify (G_OBJECT (viewport), "hadjustment");
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 21:50:36 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_set_vadjustment:
|
|
|
|
* @viewport: a #GtkViewport.
|
2009-12-10 10:23:40 +00:00
|
|
|
* @adjustment: (allow-none): a #GtkAdjustment.
|
|
|
|
*
|
2001-12-10 21:50:36 +00:00
|
|
|
* Sets the vertical adjustment of the viewport.
|
2010-10-18 04:21:39 +00:00
|
|
|
*
|
|
|
|
* Deprecated: 3.0: Use gtk_scrollable_set_vadjustment()
|
2001-12-10 21:50:36 +00:00
|
|
|
**/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_viewport_set_vadjustment (GtkViewport *viewport,
|
|
|
|
GtkAdjustment *adjustment)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
|
1998-11-05 15:44:22 +00:00
|
|
|
if (adjustment)
|
|
|
|
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, adjustment);
|
2001-03-30 15:46:17 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
g_object_notify (G_OBJECT (viewport), "vadjustment");
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-12-10 21:50:36 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_set_shadow_type:
|
|
|
|
* @viewport: a #GtkViewport.
|
|
|
|
* @type: the new shadow type.
|
|
|
|
*
|
|
|
|
* Sets the shadow type of the viewport.
|
|
|
|
**/
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
|
|
|
gtk_viewport_set_shadow_type (GtkViewport *viewport,
|
|
|
|
GtkShadowType type)
|
|
|
|
{
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv;
|
2010-08-11 20:05:30 +00:00
|
|
|
GtkAllocation allocation;
|
|
|
|
GtkWidget *widget;
|
2010-07-13 21:20:38 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
|
|
|
|
|
2010-08-11 20:05:30 +00:00
|
|
|
widget = GTK_WIDGET (viewport);
|
2010-07-13 21:20:38 +00:00
|
|
|
priv = viewport->priv;
|
|
|
|
|
|
|
|
if ((GtkShadowType) priv->shadow_type != type)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-07-13 21:20:38 +00:00
|
|
|
priv->shadow_type = type;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-11 20:05:30 +00:00
|
|
|
if (gtk_widget_get_visible (widget))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-08-11 20:05:30 +00:00
|
|
|
gtk_widget_get_allocation (widget, &allocation);
|
|
|
|
gtk_widget_size_allocate (widget, &allocation);
|
|
|
|
gtk_widget_set_allocation (widget, &allocation);
|
|
|
|
gtk_widget_queue_draw (widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
2001-03-30 15:46:17 +00:00
|
|
|
|
2005-03-26 05:49:15 +00:00
|
|
|
g_object_notify (G_OBJECT (viewport), "shadow-type");
|
2002-01-28 18:52:49 +00:00
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
2001-06-24 15:34:48 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_get_shadow_type:
|
|
|
|
* @viewport: a #GtkViewport
|
|
|
|
*
|
|
|
|
* Gets the shadow type of the #GtkViewport. See
|
|
|
|
* gtk_viewport_set_shadow_type().
|
2010-07-13 21:20:38 +00:00
|
|
|
*
|
2001-06-24 15:34:48 +00:00
|
|
|
* Return value: the shadow type
|
|
|
|
**/
|
|
|
|
GtkShadowType
|
|
|
|
gtk_viewport_get_shadow_type (GtkViewport *viewport)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), GTK_SHADOW_NONE);
|
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
return viewport->priv->shadow_type;
|
2001-06-24 15:34:48 +00:00
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2009-10-21 16:12:01 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_get_bin_window:
|
|
|
|
* @viewport: a #GtkViewport
|
|
|
|
*
|
|
|
|
* Gets the bin window of the #GtkViewport.
|
|
|
|
*
|
2010-09-21 04:18:11 +00:00
|
|
|
* Return value: (transfer none): a #GdkWindow
|
2009-10-21 16:12:01 +00:00
|
|
|
*
|
|
|
|
* Since: 2.20
|
|
|
|
**/
|
|
|
|
GdkWindow*
|
|
|
|
gtk_viewport_get_bin_window (GtkViewport *viewport)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
|
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
return viewport->priv->bin_window;
|
2009-10-21 16:12:01 +00:00
|
|
|
}
|
|
|
|
|
2010-06-09 11:02:46 +00:00
|
|
|
/**
|
|
|
|
* gtk_viewport_get_view_window:
|
|
|
|
* @viewport: a #GtkViewport
|
|
|
|
*
|
|
|
|
* Gets the view window of the #GtkViewport.
|
|
|
|
*
|
|
|
|
* Return value: (transfer none): a #GdkWindow
|
|
|
|
*
|
|
|
|
* Since: 2.22
|
|
|
|
**/
|
|
|
|
GdkWindow*
|
|
|
|
gtk_viewport_get_view_window (GtkViewport *viewport)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
|
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
return viewport->priv->view_window;
|
2010-06-09 11:02:46 +00:00
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_viewport_realize (GtkWidget *widget)
|
|
|
|
{
|
2003-06-06 23:08:14 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
2003-06-06 23:08:14 +00:00
|
|
|
GtkBin *bin = GTK_BIN (widget);
|
2011-11-16 23:29:30 +00:00
|
|
|
GtkAdjustment *hadjustment = priv->hadjustment;
|
|
|
|
GtkAdjustment *vadjustment = priv->vadjustment;
|
2010-08-11 20:05:30 +00:00
|
|
|
GtkAllocation allocation;
|
2003-06-06 23:08:14 +00:00
|
|
|
GtkAllocation view_allocation;
|
2011-01-10 02:38:35 +00:00
|
|
|
GtkStyleContext *context;
|
2010-05-24 20:31:36 +00:00
|
|
|
GtkWidget *child;
|
2010-08-11 20:05:30 +00:00
|
|
|
GdkWindow *window;
|
1997-11-24 22:37:52 +00:00
|
|
|
GdkWindowAttr attributes;
|
|
|
|
gint attributes_mask;
|
1998-02-17 04:48:50 +00:00
|
|
|
gint event_mask;
|
2010-05-24 20:31:36 +00:00
|
|
|
guint border_width;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-06-02 04:28:22 +00:00
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
|
|
|
|
2010-03-06 10:51:33 +00:00
|
|
|
gtk_widget_set_realized (widget, TRUE);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-11 20:05:30 +00:00
|
|
|
gtk_widget_get_allocation (widget, &allocation);
|
|
|
|
|
|
|
|
attributes.x = allocation.x + border_width;
|
|
|
|
attributes.y = allocation.y + border_width;
|
|
|
|
attributes.width = allocation.width - border_width * 2;
|
|
|
|
attributes.height = allocation.height - border_width * 2;
|
1997-11-24 22:37:52 +00:00
|
|
|
attributes.window_type = GDK_WINDOW_CHILD;
|
|
|
|
attributes.wclass = GDK_INPUT_OUTPUT;
|
|
|
|
attributes.visual = gtk_widget_get_visual (widget);
|
1998-02-17 04:48:50 +00:00
|
|
|
|
|
|
|
event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
|
2012-01-24 11:18:45 +00:00
|
|
|
|
|
|
|
attributes.event_mask = event_mask | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-28 16:04:08 +00:00
|
|
|
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-11 20:05:30 +00:00
|
|
|
window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
|
|
&attributes, attributes_mask);
|
|
|
|
gtk_widget_set_window (widget, window);
|
2013-02-05 08:36:49 +00:00
|
|
|
gtk_widget_register_window (widget, window);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
viewport_get_view_allocation (viewport, &view_allocation);
|
|
|
|
|
|
|
|
attributes.x = view_allocation.x;
|
|
|
|
attributes.y = view_allocation.y;
|
|
|
|
attributes.width = view_allocation.width;
|
|
|
|
attributes.height = view_allocation.height;
|
2005-01-05 16:46:34 +00:00
|
|
|
attributes.event_mask = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-08-11 20:05:30 +00:00
|
|
|
priv->view_window = gdk_window_new (window,
|
|
|
|
&attributes, attributes_mask);
|
2013-02-05 08:36:49 +00:00
|
|
|
gtk_widget_register_window (widget, priv->view_window);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2011-01-05 20:54:54 +00:00
|
|
|
attributes.x = - gtk_adjustment_get_value (hadjustment);
|
|
|
|
attributes.y = - gtk_adjustment_get_value (vadjustment);
|
|
|
|
attributes.width = gtk_adjustment_get_upper (hadjustment);
|
|
|
|
attributes.height = gtk_adjustment_get_upper (vadjustment);
|
1998-04-08 05:41:40 +00:00
|
|
|
|
1998-02-17 04:48:50 +00:00
|
|
|
attributes.event_mask = event_mask;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
priv->bin_window = gdk_window_new (priv->view_window, &attributes, attributes_mask);
|
2013-02-05 08:36:49 +00:00
|
|
|
gtk_widget_register_window (widget, priv->bin_window);
|
1998-01-18 15:09:10 +00:00
|
|
|
|
2010-05-24 20:31:36 +00:00
|
|
|
child = gtk_bin_get_child (bin);
|
|
|
|
if (child)
|
2010-07-13 21:20:38 +00:00
|
|
|
gtk_widget_set_parent_window (child, priv->bin_window);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
context = gtk_widget_get_style_context (widget);
|
|
|
|
gtk_style_context_set_background (context, window);
|
|
|
|
gtk_style_context_set_background (context, priv->bin_window);
|
1998-11-06 22:05:02 +00:00
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
gdk_window_show (priv->bin_window);
|
|
|
|
gdk_window_show (priv->view_window);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_viewport_unrealize (GtkWidget *widget)
|
|
|
|
{
|
2002-01-30 22:29:03 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2013-02-05 08:36:49 +00:00
|
|
|
gtk_widget_unregister_window (widget, priv->view_window);
|
2010-07-13 21:20:38 +00:00
|
|
|
gdk_window_destroy (priv->view_window);
|
|
|
|
priv->view_window = NULL;
|
1998-02-12 03:02:14 +00:00
|
|
|
|
2013-02-05 08:36:49 +00:00
|
|
|
gtk_widget_unregister_window (widget, priv->bin_window);
|
2010-07-13 21:20:38 +00:00
|
|
|
gdk_window_destroy (priv->bin_window);
|
|
|
|
priv->bin_window = NULL;
|
1998-02-12 03:02:14 +00:00
|
|
|
|
2008-08-12 09:44:32 +00:00
|
|
|
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize (widget);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
2010-09-07 14:56:46 +00:00
|
|
|
gtk_viewport_draw (GtkWidget *widget,
|
|
|
|
cairo_t *cr)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2010-09-14 11:11:53 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
2011-01-10 02:38:35 +00:00
|
|
|
GtkStyleContext *context;
|
2010-09-20 14:44:38 +00:00
|
|
|
int x, y;
|
2010-09-14 11:11:53 +00:00
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
context = gtk_widget_get_style_context (widget);
|
|
|
|
|
2012-02-09 15:38:54 +00:00
|
|
|
if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)) &&
|
|
|
|
priv->shadow_type != GTK_SHADOW_NONE)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2011-01-10 02:38:35 +00:00
|
|
|
gtk_style_context_save (context);
|
|
|
|
gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
|
|
|
|
|
|
|
|
gtk_render_frame (context, cr, 0, 0,
|
2010-09-20 14:44:38 +00:00
|
|
|
gdk_window_get_width (gtk_widget_get_window (widget)),
|
|
|
|
gdk_window_get_height (gtk_widget_get_window (widget)));
|
2011-01-10 02:38:35 +00:00
|
|
|
|
|
|
|
gtk_style_context_restore (context);
|
2010-09-14 11:11:53 +00:00
|
|
|
}
|
|
|
|
|
2010-10-05 21:22:25 +00:00
|
|
|
if (gtk_cairo_should_draw_window (cr, priv->view_window))
|
|
|
|
{
|
|
|
|
/* This is a cute hack to ensure the contents of bin_window are
|
|
|
|
* restricted to where they are visible. We only need to do this
|
|
|
|
* clipping when called via gtk_widget_draw() and not in expose
|
|
|
|
* events. And when that happens every window (including this one)
|
|
|
|
* should be drawn.
|
|
|
|
*/
|
|
|
|
gdk_window_get_position (priv->view_window, &x, &y);
|
|
|
|
cairo_rectangle (cr, x, y,
|
|
|
|
gdk_window_get_width (priv->view_window),
|
|
|
|
gdk_window_get_height (priv->view_window));
|
|
|
|
cairo_clip (cr);
|
|
|
|
}
|
|
|
|
|
2010-09-14 11:11:53 +00:00
|
|
|
if (gtk_cairo_should_draw_window (cr, priv->bin_window))
|
|
|
|
{
|
|
|
|
gdk_window_get_position (priv->bin_window, &x, &y);
|
2011-01-10 02:38:35 +00:00
|
|
|
gtk_render_background (context, cr, x, y,
|
|
|
|
gdk_window_get_width (priv->bin_window),
|
|
|
|
gdk_window_get_height (priv->bin_window));
|
2010-09-14 11:11:53 +00:00
|
|
|
|
|
|
|
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->draw (widget, cr);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
1998-01-18 15:09:10 +00:00
|
|
|
static void
|
|
|
|
gtk_viewport_add (GtkContainer *container,
|
1998-07-16 02:47:15 +00:00
|
|
|
GtkWidget *child)
|
1998-01-18 15:09:10 +00:00
|
|
|
{
|
2008-02-27 11:30:10 +00:00
|
|
|
GtkBin *bin = GTK_BIN (container);
|
2010-07-13 21:20:38 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (bin);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
1998-01-18 15:09:10 +00:00
|
|
|
|
2010-05-24 20:31:36 +00:00
|
|
|
g_return_if_fail (gtk_bin_get_child (bin) == NULL);
|
1998-01-18 15:09:10 +00:00
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
gtk_widget_set_parent_window (child, priv->bin_window);
|
1998-01-18 15:09:10 +00:00
|
|
|
|
2006-05-02 23:56:43 +00:00
|
|
|
GTK_CONTAINER_CLASS (gtk_viewport_parent_class)->add (container, child);
|
1998-01-18 15:09:10 +00:00
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
static void
|
|
|
|
gtk_viewport_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
2010-08-11 20:05:30 +00:00
|
|
|
GtkAllocation widget_allocation;
|
2001-11-15 21:04:51 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
2001-11-15 21:04:51 +00:00
|
|
|
GtkBin *bin = GTK_BIN (widget);
|
2010-06-02 04:28:22 +00:00
|
|
|
guint border_width;
|
2011-11-16 23:29:30 +00:00
|
|
|
GtkAdjustment *hadjustment = priv->hadjustment;
|
|
|
|
GtkAdjustment *vadjustment = priv->vadjustment;
|
2006-09-20 15:02:01 +00:00
|
|
|
GtkAllocation child_allocation;
|
2010-05-24 20:31:36 +00:00
|
|
|
GtkWidget *child;
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
|
2010-06-02 04:28:22 +00:00
|
|
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
|
|
|
|
2001-11-15 21:04:51 +00:00
|
|
|
/* If our size changed, and we have a shadow, queue a redraw on widget->window to
|
|
|
|
* redraw the shadow correctly.
|
|
|
|
*/
|
2010-08-11 20:05:30 +00:00
|
|
|
gtk_widget_get_allocation (widget, &widget_allocation);
|
2010-03-02 04:19:28 +00:00
|
|
|
if (gtk_widget_get_mapped (widget) &&
|
2010-07-13 21:20:38 +00:00
|
|
|
priv->shadow_type != GTK_SHADOW_NONE &&
|
2010-08-11 20:05:30 +00:00
|
|
|
(widget_allocation.width != allocation->width ||
|
|
|
|
widget_allocation.height != allocation->height))
|
|
|
|
gdk_window_invalidate_rect (gtk_widget_get_window (widget), NULL, FALSE);
|
|
|
|
|
|
|
|
gtk_widget_set_allocation (widget, allocation);
|
|
|
|
|
2011-01-05 20:53:04 +00:00
|
|
|
g_object_freeze_notify (G_OBJECT (hadjustment));
|
|
|
|
g_object_freeze_notify (G_OBJECT (vadjustment));
|
|
|
|
|
|
|
|
viewport_set_hadjustment_values (viewport);
|
|
|
|
viewport_set_vadjustment_values (viewport);
|
2006-09-20 15:02:01 +00:00
|
|
|
|
|
|
|
child_allocation.x = 0;
|
|
|
|
child_allocation.y = 0;
|
2011-01-05 20:54:54 +00:00
|
|
|
child_allocation.width = gtk_adjustment_get_upper (hadjustment);
|
|
|
|
child_allocation.height = gtk_adjustment_get_upper (vadjustment);
|
2010-03-02 06:16:02 +00:00
|
|
|
if (gtk_widget_get_realized (widget))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2003-06-06 23:08:14 +00:00
|
|
|
GtkAllocation view_allocation;
|
2010-08-11 20:05:30 +00:00
|
|
|
|
|
|
|
gdk_window_move_resize (gtk_widget_get_window (widget),
|
1998-03-24 01:43:21 +00:00
|
|
|
allocation->x + border_width,
|
|
|
|
allocation->y + border_width,
|
|
|
|
allocation->width - border_width * 2,
|
|
|
|
allocation->height - border_width * 2);
|
2006-09-20 15:02:01 +00:00
|
|
|
|
|
|
|
viewport_get_view_allocation (viewport, &view_allocation);
|
2010-07-13 21:20:38 +00:00
|
|
|
gdk_window_move_resize (priv->view_window,
|
2003-06-06 23:08:14 +00:00
|
|
|
view_allocation.x,
|
|
|
|
view_allocation.y,
|
|
|
|
view_allocation.width,
|
|
|
|
view_allocation.height);
|
2010-07-13 21:20:38 +00:00
|
|
|
gdk_window_move_resize (priv->bin_window,
|
2011-01-05 20:54:54 +00:00
|
|
|
- gtk_adjustment_get_value (hadjustment),
|
|
|
|
- gtk_adjustment_get_value (vadjustment),
|
2006-09-20 15:02:01 +00:00
|
|
|
child_allocation.width,
|
|
|
|
child_allocation.height);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
2010-05-24 20:31:36 +00:00
|
|
|
|
|
|
|
child = gtk_bin_get_child (bin);
|
|
|
|
if (child && gtk_widget_get_visible (child))
|
|
|
|
gtk_widget_size_allocate (child, &child_allocation);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2011-01-05 20:53:04 +00:00
|
|
|
g_object_thaw_notify (G_OBJECT (hadjustment));
|
|
|
|
g_object_thaw_notify (G_OBJECT (vadjustment));
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
|
|
|
|
gpointer data)
|
|
|
|
{
|
2008-02-27 11:30:10 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (data);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
2008-02-27 11:30:10 +00:00
|
|
|
GtkBin *bin = GTK_BIN (data);
|
2010-05-24 20:31:36 +00:00
|
|
|
GtkWidget *child;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-05-24 20:31:36 +00:00
|
|
|
child = gtk_bin_get_child (bin);
|
|
|
|
if (child && gtk_widget_get_visible (child) &&
|
2010-03-02 06:16:02 +00:00
|
|
|
gtk_widget_get_realized (GTK_WIDGET (viewport)))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
2011-11-16 23:29:30 +00:00
|
|
|
GtkAdjustment *hadjustment = priv->hadjustment;
|
|
|
|
GtkAdjustment *vadjustment = priv->vadjustment;
|
2003-06-06 23:08:14 +00:00
|
|
|
gint old_x, old_y;
|
|
|
|
gint new_x, new_y;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
gdk_window_get_position (priv->bin_window, &old_x, &old_y);
|
2011-01-05 20:54:54 +00:00
|
|
|
new_x = - gtk_adjustment_get_value (hadjustment);
|
|
|
|
new_y = - gtk_adjustment_get_value (vadjustment);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
2003-06-06 23:08:14 +00:00
|
|
|
if (new_x != old_x || new_y != old_y)
|
2012-04-05 13:48:51 +00:00
|
|
|
gdk_window_move (priv->bin_window, new_x, new_y);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
1998-11-06 22:05:02 +00:00
|
|
|
|
|
|
|
static void
|
2011-01-10 02:38:35 +00:00
|
|
|
gtk_viewport_style_updated (GtkWidget *widget)
|
1998-11-06 22:05:02 +00:00
|
|
|
{
|
2011-02-07 12:30:37 +00:00
|
|
|
GTK_WIDGET_CLASS (gtk_viewport_parent_class)->style_updated (widget);
|
|
|
|
|
2010-03-02 06:16:02 +00:00
|
|
|
if (gtk_widget_get_realized (widget) &&
|
2010-01-04 06:49:26 +00:00
|
|
|
gtk_widget_get_has_window (widget))
|
1998-11-06 22:05:02 +00:00
|
|
|
{
|
2011-01-10 02:38:35 +00:00
|
|
|
GtkStyleContext *context;
|
2011-02-07 12:30:37 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
2008-02-27 11:30:10 +00:00
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
context = gtk_widget_get_style_context (widget);
|
|
|
|
gtk_style_context_set_background (context, priv->bin_window);
|
|
|
|
gtk_style_context_set_background (context, gtk_widget_get_window (widget));
|
1998-11-06 22:05:02 +00:00
|
|
|
}
|
|
|
|
}
|
2005-03-20 07:01:23 +00:00
|
|
|
|
2010-04-13 02:21:46 +00:00
|
|
|
|
|
|
|
static void
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_viewport_get_preferred_size (GtkWidget *widget,
|
|
|
|
GtkOrientation orientation,
|
|
|
|
gint *minimum_size,
|
|
|
|
gint *natural_size)
|
2010-04-06 21:15:50 +00:00
|
|
|
{
|
2010-07-13 21:20:38 +00:00
|
|
|
GtkViewport *viewport = GTK_VIEWPORT (widget);
|
2010-08-26 17:15:37 +00:00
|
|
|
GtkViewportPrivate *priv = viewport->priv;
|
2011-01-10 02:38:35 +00:00
|
|
|
GtkStyleContext *context;
|
|
|
|
GtkStateFlags state;
|
|
|
|
GtkBorder padding, border;
|
2010-04-13 02:21:46 +00:00
|
|
|
GtkWidget *child;
|
|
|
|
gint child_min, child_nat;
|
|
|
|
gint minimum, natural;
|
2010-04-06 21:15:50 +00:00
|
|
|
|
2010-06-18 04:11:26 +00:00
|
|
|
child = gtk_bin_get_child (GTK_BIN (widget));
|
2010-04-06 21:15:50 +00:00
|
|
|
|
2010-04-13 02:21:46 +00:00
|
|
|
/* XXX This should probably be (border_width * 2); but GTK+ has
|
|
|
|
* been doing this with a single border for a while now...
|
|
|
|
*/
|
2010-06-02 04:28:22 +00:00
|
|
|
minimum = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
2010-04-06 21:15:50 +00:00
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
context = gtk_widget_get_style_context (GTK_WIDGET (widget));
|
|
|
|
state = gtk_widget_get_state_flags (GTK_WIDGET (widget));
|
|
|
|
gtk_style_context_get_padding (context, state, &padding);
|
|
|
|
|
2010-07-13 21:20:38 +00:00
|
|
|
if (priv->shadow_type != GTK_SHADOW_NONE)
|
2010-04-06 21:15:50 +00:00
|
|
|
{
|
2011-01-10 02:38:35 +00:00
|
|
|
gtk_style_context_get_border (context, state, &border);
|
|
|
|
|
2010-04-13 02:21:46 +00:00
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2011-01-10 02:38:35 +00:00
|
|
|
minimum += border.left + border.right;
|
2010-04-13 02:21:46 +00:00
|
|
|
else
|
2011-01-10 02:38:35 +00:00
|
|
|
minimum += border.top + border.bottom;
|
2010-04-06 21:15:50 +00:00
|
|
|
}
|
|
|
|
|
2011-01-10 02:38:35 +00:00
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
|
|
|
minimum += padding.left + padding.right;
|
|
|
|
else
|
|
|
|
minimum += padding.top + padding.bottom;
|
|
|
|
|
2010-04-13 02:21:46 +00:00
|
|
|
natural = minimum;
|
|
|
|
|
2010-04-06 21:15:50 +00:00
|
|
|
if (child && gtk_widget_get_visible (child))
|
|
|
|
{
|
2010-04-13 02:21:46 +00:00
|
|
|
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_widget_get_preferred_width (child, &child_min, &child_nat);
|
2010-04-13 02:21:46 +00:00
|
|
|
else
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_widget_get_preferred_height (child, &child_min, &child_nat);
|
2010-04-06 21:15:50 +00:00
|
|
|
|
2010-04-13 02:21:46 +00:00
|
|
|
minimum += child_min;
|
|
|
|
natural += child_nat;
|
2010-04-06 21:15:50 +00:00
|
|
|
}
|
2010-04-20 05:27:32 +00:00
|
|
|
|
|
|
|
if (minimum_size)
|
|
|
|
*minimum_size = minimum;
|
|
|
|
|
|
|
|
if (natural_size)
|
|
|
|
*natural_size = natural;
|
2010-04-06 21:15:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_viewport_get_preferred_width (GtkWidget *widget,
|
|
|
|
gint *minimum_size,
|
|
|
|
gint *natural_size)
|
2010-04-13 02:21:46 +00:00
|
|
|
{
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_viewport_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
|
2010-04-13 02:21:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_viewport_get_preferred_height (GtkWidget *widget,
|
|
|
|
gint *minimum_size,
|
|
|
|
gint *natural_size)
|
2010-04-06 21:15:50 +00:00
|
|
|
{
|
2010-09-21 14:35:17 +00:00
|
|
|
gtk_viewport_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
|
2010-04-06 21:15:50 +00:00
|
|
|
}
|