diff options
| author | Tim Janik <timj@gtk.org> | 1998-11-28 07:42:37 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-11-28 07:42:37 +0000 |
| commit | 238ede333fb92750520071b71ebff7130b4c8803 (patch) | |
| tree | e53ab2172e6542b6c65d90b25e57823475a82202 /gtk | |
| parent | 67d445eebc8d350f5a5131dc6e3d7b8d8ef9da13 (diff) | |
| download | gdk-pixbuf-238ede333fb92750520071b71ebff7130b4c8803.tar.gz | |
changed scrolled window inheritance, it inherits from GtkBin now.
Sat Nov 28 03:13:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkscrolledwindow.h:
* gtk/gtkscrolledwindow.c: changed scrolled window inheritance,
it inherits from GtkBin now.
* gtk/gtkbin.c (gtk_bin_unmap): removed superfluous check for
visibility of child.
(gtk_bin_draw): removed superfluous check for GTK_WIDGET_DRAWABLE().
added check so a child gets only drawn if it's visible.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: removed gtk_widget_draw_children().
* gtk/gtkstyle.h:
* gtk/gtkstyle.c: rmoved gtk_reset_widget_shapes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: removed crufty relict: gtk_widget_is_child().
added internal function gtk_widget_reset_shapes() from gtkstyle.c.
* gtk/gtkrc.h:
* gtk/gtkrc.c: (gtk_rc_find_pixmap_in_path): removed bogus gscanner
argument, changed callers.
* gtk/gtkmenufactory.c: GtkMenuFactory is deprecated for a long time,
it will issue a warning now.
* gtk/gtkcompat.h: new file to #define aliases for historic
function names.
* changed 8 function names for consistency and provided aliases to keep
source compatibility in gtkcompat.h:
(gtk_accel_label_get_accel_width): renamed from gtk_accel_label_accelerator_width
(gtk_container_set_border_width): renamed from gtk_container_border_width
(gtk_notebook_get_current_page): renamed from gtk_notebook_current_page
(gtk_packer_configure): renamed from gtk_packer_set_child_packing
(gtk_paned_set_gutter_size): renamed from gtk_paned_gutter_size
(gtk_paned_set_handle_size): renamed from gtk_paned_handle_size
(gtk_scale_get_value_width): renamed from gtk_scale_value_width
(gtk_window_set_position): renamed from gtk_window_position
* renamed a few recently added funtions for consistency:
(gtk_notebook_get_tab_label): renamed from gtk_notebook_query_tab_label.
(gtk_notebook_get_menu_label): renamed from gtk_notebook_query_menu_label.
(gtk_progress_configure): renamed from gtk_progress_reconfigure.
Diffstat (limited to 'gtk')
44 files changed, 443 insertions, 504 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e3c33eb94..056136441 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -117,7 +117,7 @@ libgtk_la_SOURCES = \ $(static_sources) \ gtkmarshal.c -# Source headers are are non-autogenerated headers +# Source headers which are non-autogenerated headers source_headers = \ gtk.h \ gtkaccelgroup.h \ @@ -138,6 +138,7 @@ source_headers = \ gtkclist.h \ gtkcolorsel.h \ gtkcombo.h \ + gtkcompat.h \ gtkcontainer.h \ gtkctree.h \ gtkcurve.h \ @@ -39,6 +39,7 @@ #include <gtk/gtkclist.h> #include <gtk/gtkcolorsel.h> #include <gtk/gtkcombo.h> +#include <gtk/gtkcompat.h> #include <gtk/gtkcontainer.h> #include <gtk/gtkctree.h> #include <gtk/gtkcurve.h> diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 30214e2c9..11933d03e 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -206,7 +206,7 @@ gtk_accel_label_finalize (GtkObject *object) } guint -gtk_accel_label_accelerator_width (GtkAccelLabel *accel_label) +gtk_accel_label_get_accel_width (GtkAccelLabel *accel_label) { g_return_val_if_fail (accel_label != NULL, 0); g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), 0); @@ -252,7 +252,7 @@ gtk_accel_label_expose_event (GtkWidget *widget, { guint ac_width; - ac_width = gtk_accel_label_accelerator_width (accel_label); + ac_width = gtk_accel_label_get_accel_width (accel_label); if (widget->allocation.width >= widget->requisition.width + ac_width) { diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index ecfa03946..cd11cb77c 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -69,7 +69,7 @@ struct _GtkAccelLabelClass GtkType gtk_accel_label_get_type (void); GtkWidget* gtk_accel_label_new (const gchar *string); -guint gtk_accel_label_accelerator_width (GtkAccelLabel *accel_label); +guint gtk_accel_label_get_accel_width (GtkAccelLabel *accel_label); void gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label, GtkWidget *accel_widget); gboolean gtk_accel_label_refetch (GtkAccelLabel *accel_label); diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index e3bdab1fc..feff474b6 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -146,9 +146,7 @@ gtk_bin_unmap (GtkWidget *widget) else gdk_window_hide (widget->window); - if (bin->child && - GTK_WIDGET_VISIBLE (bin->child) && - GTK_WIDGET_MAPPED (bin->child)) + if (bin->child && GTK_WIDGET_MAPPED (bin->child)) gtk_widget_unmap (bin->child); } @@ -162,14 +160,11 @@ gtk_bin_draw (GtkWidget *widget, g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_BIN (widget)); - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) - { - bin = GTK_BIN (widget); - - if (bin->child && - gtk_widget_intersect (bin->child, area, &child_area)) - gtk_widget_draw (bin->child, &child_area); - } + bin = GTK_BIN (widget); + + if (bin->child && GTK_WIDGET_VISIBLE (bin->child) && + gtk_widget_intersect (bin->child, area, &child_area)) + gtk_widget_draw (bin->child, &child_area); } static gint diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 89b253267..673a962e2 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -288,7 +288,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) colorsel->policy = GTK_UPDATE_CONTINUOUS; hbox = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_container_add (GTK_CONTAINER (colorsel), hbox); vbox = gtk_vbox_new (FALSE, 5); @@ -324,7 +324,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_container_border_width (GTK_CONTAINER (frame), 0); + gtk_container_set_border_width (GTK_CONTAINER (frame), 0); gtk_box_pack_start (GTK_BOX (hbox2), frame, FALSE, TRUE, 0); gtk_widget_show (frame); @@ -1609,7 +1609,7 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag) GtkWidget *action_area, *frame; colorseldiag->main_vbox = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (colorseldiag), 10); + gtk_container_set_border_width (GTK_CONTAINER (colorseldiag), 10); gtk_container_add (GTK_CONTAINER (colorseldiag), colorseldiag->main_vbox); gtk_widget_show (colorseldiag->main_vbox); diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 6275c1f44..4bd9604f9 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -302,14 +302,14 @@ gtk_combo_get_pos (GtkCombo * combo, gint * x, gint * y, gint * height, gint * w 2 * popwin->child->style->klass->xthickness - 2 * GTK_CONTAINER (popwin->child)->border_width - 2 * GTK_CONTAINER (combo->popup)->border_width - - 2 * GTK_CONTAINER (popup->child)->border_width - - 2 * popup->child->style->klass->xthickness); + 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width - + 2 * GTK_BIN (popup)->child->style->klass->xthickness); work_height = (2 * popwin->child->style->klass->ythickness + 2 * GTK_CONTAINER (popwin->child)->border_width + 2 * GTK_CONTAINER (combo->popup)->border_width + - 2 * GTK_CONTAINER (popup->child)->border_width + - 2 * popup->child->style->klass->xthickness); + 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width + + 2 * GTK_BIN (popup)->child->style->klass->xthickness); do { diff --git a/gtk/gtkcompat.h b/gtk/gtkcompat.h new file mode 100644 index 000000000..b4370a855 --- /dev/null +++ b/gtk/gtkcompat.h @@ -0,0 +1,46 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#ifndef __GTK_COMPAT_H__ +#define __GTK_COMPAT_H__ + + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +/* this file contains aliases that have to be kept for historical + * reasons, because a wide code base depends on them. + */ +#define gtk_accel_label_accelerator_width gtk_accel_label_get_accel_width +#define gtk_container_border_width gtk_container_set_border_width +#define gtk_notebook_current_page gtk_notebook_get_current_page +#define gtk_packer_configure gtk_packer_set_child_packing +#define gtk_paned_gutter_size gtk_paned_set_gutter_size +#define gtk_paned_handle_size gtk_paned_set_handle_size +#define gtk_scale_value_width gtk_scale_get_value_width +#define gtk_window_position gtk_window_set_position + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* __GTK_COMPAT_H__ */ diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index c78c160a6..52f1c4a30 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -629,7 +629,7 @@ gtk_container_set_arg (GtkObject *object, switch (arg_id) { case ARG_BORDER_WIDTH: - gtk_container_border_width (container, GTK_VALUE_ULONG (*arg)); + gtk_container_set_border_width (container, GTK_VALUE_ULONG (*arg)); break; case ARG_RESIZE_MODE: gtk_container_set_resize_mode (container, GTK_VALUE_ENUM (*arg)); @@ -666,8 +666,8 @@ gtk_container_get_arg (GtkObject *object, } void -gtk_container_border_width (GtkContainer *container, - guint border_width) +gtk_container_set_border_width (GtkContainer *container, + guint border_width) { g_return_if_fail (container != NULL); g_return_if_fail (GTK_IS_CONTAINER (container)); diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 285b4a4da..6f518bb46 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -92,7 +92,7 @@ struct _GtkContainerClass /* Application-level methods */ GtkType gtk_container_get_type (void); -void gtk_container_border_width (GtkContainer *container, +void gtk_container_set_border_width (GtkContainer *container, guint border_width); void gtk_container_add (GtkContainer *container, GtkWidget *widget); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 0e19e14bb..81b3e394c 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -67,7 +67,7 @@ gtk_dialog_init (GtkDialog *dialog) gtk_widget_show (dialog->vbox); dialog->action_area = gtk_hbox_new (TRUE, 5); - gtk_container_border_width (GTK_CONTAINER (dialog->action_area), 10); + gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 10); gtk_box_pack_end (GTK_BOX (dialog->vbox), dialog->action_area, FALSE, TRUE, 0); gtk_widget_show (dialog->action_area); diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 90a578461..cd35e14b8 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -376,7 +376,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) /* The dialog-sized vertical box */ filesel->main_vbox = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (filesel), 10); + gtk_container_set_border_width (GTK_CONTAINER (filesel), 10); gtk_container_add (GTK_CONTAINER (filesel), filesel->main_vbox); gtk_widget_show (filesel->main_vbox); @@ -418,7 +418,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->dir_list); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_container_border_width (GTK_CONTAINER (scrolled_win), 5); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 5); gtk_box_pack_start (GTK_BOX (list_hbox), scrolled_win, TRUE, TRUE, 0); gtk_widget_show (filesel->dir_list); gtk_widget_show (scrolled_win); @@ -435,7 +435,7 @@ gtk_file_selection_init (GtkFileSelection *filesel) gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->file_list); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_container_border_width (GTK_CONTAINER (scrolled_win), 5); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 5); gtk_box_pack_start (GTK_BOX (list_hbox), scrolled_win, TRUE, TRUE, 0); gtk_widget_show (filesel->file_list); gtk_widget_show (scrolled_win); @@ -708,10 +708,10 @@ gtk_file_selection_fileop_error (gchar *error_message) (gpointer) fs); */ gtk_window_set_title (GTK_WINDOW (dialog), "Error"); - gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); vbox = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vbox), 8); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -801,7 +801,7 @@ gtk_file_selection_create_dir (GtkWidget *widget, gpointer data) (GtkSignalFunc) gtk_file_selection_fileop_destroy, (gpointer) fs); gtk_window_set_title (GTK_WINDOW (dialog), "Create Directory"); - gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); /* If file dialog is grabbed, grab option dialog */ /* When option dialog is closed, file dialog will be grabbed again */ @@ -809,7 +809,7 @@ gtk_file_selection_create_dir (GtkWidget *widget, gpointer data) gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); vbox = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vbox), 8); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -906,7 +906,7 @@ gtk_file_selection_delete_file (GtkWidget *widget, gpointer data) (GtkSignalFunc) gtk_file_selection_fileop_destroy, (gpointer) fs); gtk_window_set_title (GTK_WINDOW (dialog), "Delete File"); - gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); /* If file dialog is grabbed, grab option dialog */ /* When option dialog is closed, file dialog will be grabbed again */ @@ -914,7 +914,7 @@ gtk_file_selection_delete_file (GtkWidget *widget, gpointer data) gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); vbox = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vbox), 8); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 8); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); @@ -1010,7 +1010,7 @@ gtk_file_selection_rename_file (GtkWidget *widget, gpointer data) (GtkSignalFunc) gtk_file_selection_fileop_destroy, (gpointer) fs); gtk_window_set_title (GTK_WINDOW (dialog), "Rename File"); - gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE); /* If file dialog is grabbed, grab option dialog */ /* When option dialog closed, file dialog will be grabbed again */ @@ -1018,7 +1018,7 @@ gtk_file_selection_rename_file (GtkWidget *widget, gpointer data) gtk_window_set_modal (GTK_WINDOW(dialog), TRUE); vbox = gtk_vbox_new(FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(vbox), 8); + gtk_container_set_border_width (GTK_CONTAINER(vbox), 8); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0); gtk_widget_show(vbox); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 7c664306e..7deff3146 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -473,7 +473,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel) /* Create the main notebook page. */ fontsel->main_vbox = gtk_vbox_new (FALSE, 4); gtk_widget_show (fontsel->main_vbox); - gtk_container_border_width (GTK_CONTAINER (fontsel->main_vbox), 6); + gtk_container_set_border_width (GTK_CONTAINER (fontsel->main_vbox), 6); label = gtk_label_new("Font"); gtk_widget_set_usize (label, 120, -1); gtk_notebook_append_page (GTK_NOTEBOOK (fontsel), @@ -671,7 +671,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel) text_box = gtk_hbox_new (FALSE, 0); gtk_widget_show (text_box); gtk_container_add (GTK_CONTAINER (text_frame), text_box); - gtk_container_border_width (GTK_CONTAINER (text_box), 4); + gtk_container_set_border_width (GTK_CONTAINER (text_box), 4); fontsel->preview_entry = gtk_entry_new (); gtk_widget_show (fontsel->preview_entry); @@ -689,7 +689,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel) /* Create the font info page */ fontsel->info_vbox = gtk_vbox_new (FALSE, 4); gtk_widget_show (fontsel->info_vbox); - gtk_container_border_width (GTK_CONTAINER (fontsel->info_vbox), 2); + gtk_container_set_border_width (GTK_CONTAINER (fontsel->info_vbox), 2); label = gtk_label_new("Font Information"); gtk_widget_set_usize (label, 120, -1); gtk_notebook_append_page (GTK_NOTEBOOK (fontsel), @@ -760,7 +760,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel) /* Create the Filter page. */ fontsel->filter_vbox = gtk_vbox_new (FALSE, 4); gtk_widget_show (fontsel->filter_vbox); - gtk_container_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2); + gtk_container_set_border_width (GTK_CONTAINER (fontsel->filter_vbox), 2); label = gtk_label_new("Filter"); gtk_widget_set_usize (label, 120, -1); gtk_notebook_append_page (GTK_NOTEBOOK (fontsel), @@ -3401,7 +3401,7 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag) (GtkSignalFunc) gtk_font_selection_dialog_on_configure, fontseldiag); - gtk_container_border_width (GTK_CONTAINER (fontseldiag), 4); + gtk_container_set_border_width (GTK_CONTAINER (fontseldiag), 4); gtk_window_set_policy(GTK_WINDOW(fontseldiag), FALSE, TRUE, TRUE); fontseldiag->main_vbox = gtk_vbox_new (FALSE, 4); diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 037d9b00f..13e82dc86 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -321,7 +321,7 @@ gtk_hscale_size_request (GtkWidget *widget, if (scale->draw_value) { - value_width = gtk_scale_value_width (scale); + value_width = gtk_scale_get_value_width (scale); if ((scale->value_pos == GTK_POS_LEFT) || (scale->value_pos == GTK_POS_RIGHT)) @@ -397,12 +397,12 @@ gtk_hscale_pos_trough (GtkHScale *hscale, switch (scale->value_pos) { case GTK_POS_LEFT: - *x += gtk_scale_value_width (scale) + SCALE_CLASS (scale)->value_spacing; + *x += gtk_scale_get_value_width (scale) + SCALE_CLASS (scale)->value_spacing; *y = (widget->allocation.height - *h) / 2; *w -= *x; break; case GTK_POS_RIGHT: - *w -= gtk_scale_value_width (scale) + SCALE_CLASS (scale)->value_spacing; + *w -= gtk_scale_get_value_width (scale) + SCALE_CLASS (scale)->value_spacing; *y = (widget->allocation.height - *h) / 2; break; case GTK_POS_TOP: diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c index 66bc8e5a9..bf1aa3d28 100644 --- a/gtk/gtkinputdialog.c +++ b/gtk/gtkinputdialog.c @@ -190,7 +190,7 @@ gtk_input_dialog_init (GtkInputDialog *inputd) gtk_window_set_title (GTK_WINDOW (inputd), "Input"); vbox = gtk_vbox_new (FALSE, 4); - gtk_container_border_width(GTK_CONTAINER (vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (inputd)->vbox), vbox, TRUE, TRUE, 0); if (g_list_length(device_info) <= 1) /* only core device */ diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index b05f47a85..f6245debb 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1815,7 +1815,7 @@ gtk_print (gchar *str) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); gtk_widget_show (box2); @@ -1848,7 +1848,7 @@ gtk_print (gchar *str) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); diff --git a/gtk/gtkmenufactory.c b/gtk/gtkmenufactory.c index 3e610b07e..56536c795 100644 --- a/gtk/gtkmenufactory.c +++ b/gtk/gtkmenufactory.c @@ -53,6 +53,8 @@ GtkMenuFactory* gtk_menu_factory_new (GtkMenuFactoryType type) { GtkMenuFactory *factory; + + g_warning ("gtk_menu_factory_new(): GtkMenuFactory is deprecated and will shortly vanish"); factory = g_new (GtkMenuFactory, 1); factory->path = NULL; diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 8890a7502..76611e98e 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -303,7 +303,7 @@ gtk_menu_item_accel_width_foreach (GtkWidget *widget, { guint w; - w = gtk_accel_label_accelerator_width (GTK_ACCEL_LABEL (widget)); + w = gtk_accel_label_get_accel_width (GTK_ACCEL_LABEL (widget)); *width = MAX (*width, w); } else if (GTK_IS_CONTAINER (widget)) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index dc2099e4e..31b0675ac 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -427,7 +427,7 @@ gtk_notebook_get_arg (GtkObject *object, GTK_VALUE_BOOL (*arg) = notebook->menu != NULL; break; case ARG_PAGE: - GTK_VALUE_INT (*arg) = gtk_notebook_current_page (notebook); + GTK_VALUE_INT (*arg) = gtk_notebook_get_current_page (notebook); break; case ARG_TAB_POS: GTK_VALUE_ENUM (*arg) = notebook->tab_pos; @@ -1427,7 +1427,7 @@ gtk_notebook_get_child_arg (GtkContainer *container, switch (arg_id) { case CHILD_ARG_TAB_LABEL: - label = gtk_notebook_query_tab_label (notebook, child); + label = gtk_notebook_get_tab_label (notebook, child); if (label && GTK_IS_LABEL (label)) GTK_VALUE_STRING (*arg) = g_strdup (GTK_LABEL (label)->label); @@ -1435,7 +1435,7 @@ gtk_notebook_get_child_arg (GtkContainer *container, GTK_VALUE_STRING (*arg) = NULL; break; case CHILD_ARG_MENU_LABEL: - label = gtk_notebook_query_menu_label (notebook, child); + label = gtk_notebook_get_menu_label (notebook, child); if (label && GTK_IS_LABEL (label)) GTK_VALUE_STRING (*arg) = g_strdup (GTK_LABEL (label)->label); @@ -3333,7 +3333,7 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook, gtk_widget_show (page->menu_label); menu_item = gtk_menu_item_new (); - gtk_widget_freeze_accelerators (menu_item); + gtk_widget_lock_accelerators (menu_item); gtk_container_add (GTK_CONTAINER (menu_item), page->menu_label); gtk_menu_insert (GTK_MENU (notebook->menu), menu_item, gtk_notebook_real_page_position (notebook, list)); @@ -3547,14 +3547,14 @@ gtk_notebook_remove_page (GtkNotebook *notebook, } /* Public GtkNotebook Page Switch Methods : - * gtk_notebook_current_page + * gtk_notebook_get_current_page * gtk_notebook_page_num * gtk_notebook_set_page * gtk_notebook_next_page * gtk_notebook_prev_page */ gint -gtk_notebook_current_page (GtkNotebook *notebook) +gtk_notebook_get_current_page (GtkNotebook *notebook) { g_return_val_if_fail (notebook != NULL, -1); g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), -1); @@ -3873,18 +3873,18 @@ gtk_notebook_popup_disable (GtkNotebook *notebook) /* Public GtkNotebook Page Properties Functions: * - * gtk_notebook_query_tab_label + * gtk_notebook_get_tab_label * gtk_notebook_set_tab_label * gtk_notebook_set_tab_label_text - * gtk_notebook_query_menu_label + * gtk_notebook_get_menu_label * gtk_notebook_set_menu_label * gtk_notebook_set_menu_label_text * gtk_notebook_set_tab_label_packing * gtk_notebook_query_tab_label_packing */ GtkWidget * -gtk_notebook_query_tab_label (GtkNotebook *notebook, - GtkWidget *child) +gtk_notebook_get_tab_label (GtkNotebook *notebook, + GtkWidget *child) { GList *list; @@ -3967,9 +3967,9 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook, gtk_notebook_set_tab_label (notebook, child, tab_label); } -GtkWidget * -gtk_notebook_query_menu_label (GtkNotebook *notebook, - GtkWidget *child) +GtkWidget* +gtk_notebook_get_menu_label (GtkNotebook *notebook, + GtkWidget *child) { GList *list; diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 7c0c149a8..c5ebbea40 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -132,13 +132,13 @@ void gtk_notebook_remove_page (GtkNotebook *notebook, * query, set current NoteebookPage * ***********************************************************/ -gint gtk_notebook_current_page (GtkNotebook *notebook); -gint gtk_notebook_page_num (GtkNotebook *notebook, - GtkWidget *child); -void gtk_notebook_set_page (GtkNotebook *notebook, - gint page_num); -void gtk_notebook_next_page (GtkNotebook *notebook); -void gtk_notebook_prev_page (GtkNotebook *notebook); +gint gtk_notebook_get_current_page (GtkNotebook *notebook); +gint gtk_notebook_page_num (GtkNotebook *notebook, + GtkWidget *child); +void gtk_notebook_set_page (GtkNotebook *notebook, + gint page_num); +void gtk_notebook_next_page (GtkNotebook *notebook); +void gtk_notebook_prev_page (GtkNotebook *notebook); /*********************************************************** * set Notebook, NotebookTab style * @@ -172,7 +172,7 @@ void gtk_notebook_popup_disable (GtkNotebook *notebook); * query/set NotebookPage Properties * ***********************************************************/ -GtkWidget * gtk_notebook_query_tab_label (GtkNotebook *notebook, +GtkWidget * gtk_notebook_get_tab_label (GtkNotebook *notebook, GtkWidget *child); void gtk_notebook_set_tab_label (GtkNotebook *notebook, GtkWidget *child, @@ -180,7 +180,7 @@ void gtk_notebook_set_tab_label (GtkNotebook *notebook, void gtk_notebook_set_tab_label_text (GtkNotebook *notebook, GtkWidget *child, const gchar *tab_text); -GtkWidget * gtk_notebook_query_menu_label (GtkNotebook *notebook, +GtkWidget * gtk_notebook_get_menu_label (GtkNotebook *notebook, GtkWidget *child); void gtk_notebook_set_menu_label (GtkNotebook *notebook, GtkWidget *child, diff --git a/gtk/gtkpacker.c b/gtk/gtkpacker.c index 8026646e3..3adc33385 100644 --- a/gtk/gtkpacker.c +++ b/gtk/gtkpacker.c @@ -699,16 +699,16 @@ gtk_packer_add (GtkPacker *packer, } void -gtk_packer_configure (GtkPacker *packer, - GtkWidget *child, - GtkSideType side, - GtkAnchorType anchor, - GtkPackerOptions options, - guint border_width, - guint pad_x, - guint pad_y, - guint i_pad_x, - guint i_pad_y) +gtk_packer_set_child_packing (GtkPacker *packer, + GtkWidget *child, + GtkSideType side, + GtkAnchorType anchor, + GtkPackerOptions options, + guint border_width, + guint pad_x, + guint pad_y, + guint i_pad_x, + guint i_pad_y) { GList *list; GtkPackerChild *pchild; @@ -742,8 +742,7 @@ gtk_packer_configure (GtkPacker *packer, list = g_list_next(list); } - g_warning ("gtk_packer_configure(): couldn't find child `%s' amongst the packer's children", gtk_type_name (GTK_OBJECT_TYPE (child))); - + g_warning ("couldn't find child `%s' amongst the packer's children", gtk_type_name (GTK_OBJECT_TYPE (child))); } void diff --git a/gtk/gtkpacker.h b/gtk/gtkpacker.h index 7190bbe13..0239c7748 100644 --- a/gtk/gtkpacker.h +++ b/gtk/gtkpacker.h @@ -133,7 +133,7 @@ void gtk_packer_add (GtkPacker *packer, guint pad_y, guint i_pad_x, guint i_pad_y); -void gtk_packer_configure (GtkPacker *packer, +void gtk_packer_set_child_packing (GtkPacker *packer, GtkWidget *child, GtkSideType side, GtkAnchorType anchor, diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index db5eac04e..dda82a3ca 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -412,8 +412,8 @@ gtk_paned_forall (GtkContainer *container, } void -gtk_paned_handle_size (GtkPaned *paned, - guint16 size) +gtk_paned_set_handle_size (GtkPaned *paned, + guint16 size) { gint x,y; @@ -432,8 +432,8 @@ gtk_paned_handle_size (GtkPaned *paned, } void -gtk_paned_gutter_size (GtkPaned *paned, - guint16 size) +gtk_paned_set_gutter_size (GtkPaned *paned, + guint16 size) { g_return_if_fail (paned != NULL); g_return_if_fail (GTK_IS_PANED (paned)); diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index 212569d81..6f06ce1ac 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -68,15 +68,15 @@ struct _GtkPanedClass }; -GtkType gtk_paned_get_type (void); -void gtk_paned_add1 (GtkPaned *paned, - GtkWidget *child); -void gtk_paned_add2 (GtkPaned *paned, - GtkWidget *child); -void gtk_paned_handle_size (GtkPaned *paned, - guint16 size); -void gtk_paned_gutter_size (GtkPaned *paned, - guint16 size); +GtkType gtk_paned_get_type (void); +void gtk_paned_add1 (GtkPaned *paned, + GtkWidget *child); +void gtk_paned_add2 (GtkPaned *paned, + GtkWidget *child); +void gtk_paned_set_handle_size (GtkPaned *paned, + guint16 size); +void gtk_paned_set_gutter_size (GtkPaned *paned, + guint16 size); #ifdef __cplusplus } diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index dd3b7a5e6..ce9267d53 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -475,10 +475,10 @@ gtk_progress_set_adjustment (GtkProgress *progress, } void -gtk_progress_reconfigure (GtkProgress *progress, - gfloat value, - gfloat min, - gfloat max) +gtk_progress_configure (GtkProgress *progress, + gfloat value, + gfloat min, + gfloat max) { GtkAdjustment *adj; gboolean changed = FALSE; diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h index 2bb4f3d78..4b183ca90 100644 --- a/gtk/gtkprogress.h +++ b/gtk/gtkprogress.h @@ -76,7 +76,7 @@ void gtk_progress_set_format_string (GtkProgress *progress, gchar *format); void gtk_progress_set_adjustment (GtkProgress *progress, GtkAdjustment *adjustment); -void gtk_progress_reconfigure (GtkProgress *progress, +void gtk_progress_configure (GtkProgress *progress, gfloat value, gfloat min, gfloat max); diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 3e10e45a7..a855ef22c 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -1391,8 +1391,7 @@ gtk_rc_find_pixmap_in_path (GScanner *scanner, } gchar* -gtk_rc_find_module_in_path (GScanner *scanner, - const gchar *module_file) +gtk_rc_find_module_in_path (const gchar *module_file) { gint i; gint fd; @@ -1412,13 +1411,6 @@ gtk_rc_find_module_in_path (GScanner *scanner, g_free (buf); } - - if (scanner) - g_warning ("Unable to locate loadable module in module_path: \"%s\" line %d", - module_file, scanner->line); - else - g_warning ("Unable to locate loadable module in module_path: \"%s\",", - module_file); return NULL; } diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index 93d2c13ca..bbd65a68a 100644 --- a/gtk/gtkrc.h +++ b/gtk/gtkrc.h @@ -86,8 +86,7 @@ GdkPixmap* gtk_rc_load_image (GdkColormap *colormap, const gchar *filename); gchar* gtk_rc_find_pixmap_in_path (GScanner *scanner, const gchar *pixmap_file); -gchar* gtk_rc_find_module_in_path (GScanner *scanner, - const gchar *module_file); +gchar* gtk_rc_find_module_in_path (const gchar *module_file); gchar* gtk_rc_get_theme_dir (void); gchar* gtk_rc_get_module_dir (void); diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 2bc4944a0..31e946805 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -176,7 +176,7 @@ gtk_scale_set_value_pos (GtkScale *scale, } gint -gtk_scale_value_width (GtkScale *scale) +gtk_scale_get_value_width (GtkScale *scale) { GtkRange *range; gchar buffer[128]; diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 5d7bba1bd..31a6b31f3 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -58,16 +58,16 @@ struct _GtkScaleClass }; -GtkType gtk_scale_get_type (void); -void gtk_scale_set_digits (GtkScale *scale, - gint digits); -void gtk_scale_set_draw_value (GtkScale *scale, - gint draw_value); -void gtk_scale_set_value_pos (GtkScale *scale, - GtkPositionType pos); -gint gtk_scale_value_width (GtkScale *scale); - -void gtk_scale_draw_value (GtkScale *scale); +GtkType gtk_scale_get_type (void); +void gtk_scale_set_digits (GtkScale *scale, + gint digits); +void gtk_scale_set_draw_value (GtkScale *scale, + gint draw_value); +void gtk_scale_set_value_pos (GtkScale *scale, + GtkPositionType pos); +gint gtk_scale_get_value_width (GtkScale *scale); + +void gtk_scale_draw_value (GtkScale *scale); #ifdef __cplusplus diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index ea7939f4d..5608c5cc7 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -86,7 +86,7 @@ gtk_scrolled_window_get_type (void) (GtkClassInitFunc) NULL, }; - scrolled_window_type = gtk_type_unique (GTK_TYPE_CONTAINER, &scrolled_window_info); + scrolled_window_type = gtk_type_unique (GTK_TYPE_BIN, &scrolled_window_info); } return scrolled_window_type; @@ -102,7 +102,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) object_class = (GtkObjectClass*) class; widget_class = (GtkWidgetClass*) class; container_class = (GtkContainerClass*) class; - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); + parent_class = gtk_type_class (GTK_TYPE_BIN); gtk_object_add_arg_type ("GtkScrolledWindow::hadjustment", GTK_TYPE_ADJUSTMENT, @@ -218,7 +218,6 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) gtk_container_set_resize_mode (GTK_CONTAINER (scrolled_window), GTK_RESIZE_QUEUE); - scrolled_window->child = NULL; scrolled_window->hscrollbar = NULL; scrolled_window->vscrollbar = NULL; scrolled_window->hscrollbar_policy = GTK_POLICY_ALWAYS; @@ -263,6 +262,8 @@ void gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window, GtkAdjustment *hadjustment) { + GtkBin *bin; + g_return_if_fail (scrolled_window != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window)); if (hadjustment) @@ -270,6 +271,8 @@ gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window, else hadjustment = (GtkAdjustment*) gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL); + bin = GTK_BIN (scrolled_window); + if (!scrolled_window->hscrollbar) { gtk_widget_push_composite_child (); @@ -301,8 +304,8 @@ gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window, scrolled_window); gtk_scrolled_window_adjustment_changed (hadjustment, scrolled_window); - if (scrolled_window->child) - gtk_widget_scroll_adjustements (scrolled_window->child, + if (bin->child) + gtk_widget_scroll_adjustements (bin->child, gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)), gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar))); } @@ -311,6 +314,8 @@ void gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window, GtkAdjustment *vadjustment) { + GtkBin *bin; + g_return_if_fail (scrolled_window != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window)); if (vadjustment) @@ -318,6 +323,8 @@ gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window, else vadjustment = (GtkAdjustment*) gtk_object_new (GTK_TYPE_ADJUSTMENT, NULL); + bin = GTK_BIN (scrolled_window); + if (!scrolled_window->vscrollbar) { gtk_widget_push_composite_child (); @@ -349,8 +356,8 @@ gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window, scrolled_window); gtk_scrolled_window_adjustment_changed (vadjustment, scrolled_window); - if (scrolled_window->child) - gtk_widget_scroll_adjustements (scrolled_window->child, + if (bin->child) + gtk_widget_scroll_adjustements (bin->child, gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)), gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar))); } @@ -425,8 +432,7 @@ gtk_scrolled_window_destroy (GtkObject *object) gtk_widget_destroy (scrolled_window->hscrollbar); gtk_widget_destroy (scrolled_window->vscrollbar); - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + GTK_OBJECT_CLASS (parent_class)->destroy (object); } static void @@ -445,88 +451,71 @@ gtk_scrolled_window_finalize (GtkObject *object) static void gtk_scrolled_window_map (GtkWidget *widget) { + GtkScrolledWindow *scrolled_window; + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget)); - if (!GTK_WIDGET_MAPPED (widget)) - { - GtkScrolledWindow *scrolled_window; - - scrolled_window = GTK_SCROLLED_WINDOW (widget); - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - - if (scrolled_window->child && - GTK_WIDGET_VISIBLE (scrolled_window->child) && - !GTK_WIDGET_MAPPED (scrolled_window->child)) - gtk_widget_map (scrolled_window->child); - - if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) && - !GTK_WIDGET_MAPPED (scrolled_window->hscrollbar)) - gtk_widget_map (scrolled_window->hscrollbar); - - if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) && - !GTK_WIDGET_MAPPED (scrolled_window->vscrollbar)) - gtk_widget_map (scrolled_window->vscrollbar); + scrolled_window = GTK_SCROLLED_WINDOW (widget); - gtk_widget_queue_draw (widget); - } + /* chain parent class handler to map self and child */ + GTK_WIDGET_CLASS (parent_class)->map (widget); + + if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) && + !GTK_WIDGET_MAPPED (scrolled_window->hscrollbar)) + gtk_widget_map (scrolled_window->hscrollbar); + + if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) && + !GTK_WIDGET_MAPPED (scrolled_window->vscrollbar)) + gtk_widget_map (scrolled_window->vscrollbar); } static void gtk_scrolled_window_unmap (GtkWidget *widget) { + GtkScrolledWindow *scrolled_window; + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget)); - if (GTK_WIDGET_MAPPED (widget)) - { - GtkScrolledWindow *scrolled_window; - - scrolled_window = GTK_SCROLLED_WINDOW (widget); - GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); - - if (scrolled_window->child && - GTK_WIDGET_VISIBLE (scrolled_window->child) && - GTK_WIDGET_MAPPED (scrolled_window->child)) - gtk_widget_unmap (scrolled_window->child); - - if (GTK_WIDGET_MAPPED (scrolled_window->hscrollbar)) - gtk_widget_unmap (scrolled_window->hscrollbar); - - if (GTK_WIDGET_MAPPED (scrolled_window->vscrollbar)) - gtk_widget_unmap (scrolled_window->vscrollbar); + scrolled_window = GTK_SCROLLED_WINDOW (widget); - gtk_widget_queue_clear (widget); - } + /* chain parent class handler to unmap self and child */ + GTK_WIDGET_CLASS (parent_class)->unmap (widget); + + if (GTK_WIDGET_MAPPED (scrolled_window->hscrollbar)) + gtk_widget_unmap (scrolled_window->hscrollbar); + + if (GTK_WIDGET_MAPPED (scrolled_window->vscrollbar)) + gtk_widget_unmap (scrolled_window->vscrollbar); } static void gtk_scrolled_window_draw (GtkWidget *widget, GdkRectangle *area) { + GtkScrolledWindow *scrolled_window; + GtkBin *bin; + GdkRectangle child_area; + g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget)); g_return_if_fail (area != NULL); - if (GTK_WIDGET_DRAWABLE (widget)) - { - GtkScrolledWindow *scrolled_window; - GdkRectangle child_area; - - scrolled_window = GTK_SCROLLED_WINDOW (widget); - - if (scrolled_window->child && GTK_WIDGET_VISIBLE (scrolled_window->child) && - gtk_widget_intersect (scrolled_window->child, area, &child_area)) - gtk_widget_draw (scrolled_window->child, &child_area); - - if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) && - gtk_widget_intersect (scrolled_window->hscrollbar, area, &child_area)) - gtk_widget_draw (scrolled_window->hscrollbar, &child_area); + scrolled_window = GTK_SCROLLED_WINDOW (widget); + bin = GTK_BIN (widget); - if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) && - gtk_widget_intersect (scrolled_window->vscrollbar, area, &child_area)) - gtk_widget_draw (scrolled_window->vscrollbar, &child_area); - } + if (bin->child && GTK_WIDGET_VISIBLE (bin->child) && + gtk_widget_intersect (bin->child, area, &child_area)) + gtk_widget_draw (bin->child, &child_area); + + if (GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar) && + gtk_widget_intersect (scrolled_window->hscrollbar, area, &child_area)) + gtk_widget_draw (scrolled_window->hscrollbar, &child_area); + + if (GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar) && + gtk_widget_intersect (scrolled_window->vscrollbar, area, &child_area)) + gtk_widget_draw (scrolled_window->vscrollbar, &child_area); } static void @@ -535,18 +524,20 @@ gtk_scrolled_window_forall (GtkContainer *container, GtkCallback callback, gpointer callback_data) { - GtkScrolledWindow *scrolled_window; - g_return_if_fail (container != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container)); g_return_if_fail (callback != NULL); - scrolled_window = GTK_SCROLLED_WINDOW (container); - - if (scrolled_window->child) - callback (scrolled_window->child, callback_data); + GTK_CONTAINER_CLASS (parent_class)->forall (container, + include_internals, + callback, + callback_data); if (include_internals) { + GtkScrolledWindow *scrolled_window; + + scrolled_window = GTK_SCROLLED_WINDOW (container); + if (scrolled_window->vscrollbar) callback (scrolled_window->vscrollbar, callback_data); if (scrolled_window->hscrollbar) @@ -559,6 +550,7 @@ gtk_scrolled_window_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkScrolledWindow *scrolled_window; + GtkBin *bin; gint extra_height; gint extra_width; @@ -567,16 +559,17 @@ gtk_scrolled_window_size_request (GtkWidget *widget, g_return_if_fail (requisition != NULL); scrolled_window = GTK_SCROLLED_WINDOW (widget); + bin = GTK_BIN (scrolled_window); requisition->width = 0; requisition->height = 0; - if (scrolled_window->child && GTK_WIDGET_VISIBLE (scrolled_window->child)) + if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) { - gtk_widget_size_request (scrolled_window->child, &scrolled_window->child->requisition); + gtk_widget_size_request (bin->child, &bin->child->requisition); - requisition->width += scrolled_window->child->requisition.width; - requisition->height += scrolled_window->child->requisition.height; + requisition->width += bin->child->requisition.width; + requisition->height += bin->child->requisition.height; } extra_width = 0; @@ -651,6 +644,7 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GtkScrolledWindow *scrolled_window; + GtkBin *bin; GtkAllocation relative_allocation; GtkAllocation child_allocation; @@ -659,6 +653,8 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, g_return_if_fail (allocation != NULL); scrolled_window = GTK_SCROLLED_WINDOW (widget); + bin = GTK_BIN (scrolled_window); + widget->allocation = *allocation; if (scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS) @@ -666,7 +662,7 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, if (scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS) scrolled_window->vscrollbar_visible = TRUE; - if (scrolled_window->child && GTK_WIDGET_VISIBLE (scrolled_window->child)) + if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) { gboolean previous_hvis; gboolean previous_vvis; @@ -684,7 +680,7 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, previous_hvis = scrolled_window->hscrollbar_visible; previous_vvis = scrolled_window->vscrollbar_visible; - gtk_widget_size_allocate (scrolled_window->child, &child_allocation); + gtk_widget_size_allocate (bin->child, &child_allocation); /* If, after the first iteration, the hscrollbar and the * vscrollbar flip visiblity, then we need both. @@ -804,12 +800,15 @@ gtk_scrolled_window_add (GtkContainer *container, GtkWidget *child) { GtkScrolledWindow *scrolled_window; + GtkBin *bin; + + bin = GTK_BIN (container); + g_return_if_fail (bin->child == NULL); scrolled_window = GTK_SCROLLED_WINDOW (container); - g_return_if_fail (scrolled_window->child == NULL); - gtk_widget_set_parent (child, GTK_WIDGET (container)); - scrolled_window->child = child; + gtk_widget_set_parent (child, GTK_WIDGET (bin)); + bin->child = child; /* this is a temporary message */ if (!gtk_widget_scroll_adjustements (child, @@ -818,18 +817,18 @@ gtk_scrolled_window_add (GtkContainer *container, g_message ("gtk_scrolled_window_add(): cannot add non scrollable widget " "use gtk_scrolled_window_add_with_viewport() instead"); - if (GTK_WIDGET_VISIBLE (scrolled_window)) + if (GTK_WIDGET_VISIBLE (child->parent)) { - if (GTK_WIDGET_REALIZED (scrolled_window) && + if (GTK_WIDGET_REALIZED (child->parent) && !GTK_WIDGET_REALIZED (child)) gtk_widget_realize (child); - if (GTK_WIDGET_MAPPED (scrolled_window) && + if (GTK_WIDGET_MAPPED (child->parent) && !GTK_WIDGET_MAPPED (child)) gtk_widget_map (child); } - - if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (scrolled_window)) + + if (GTK_WIDGET_VISIBLE (child) && GTK_WIDGET_VISIBLE (container)) gtk_widget_queue_resize (child); } @@ -837,30 +836,22 @@ static void gtk_scrolled_window_remove (GtkContainer *container, GtkWidget *child) { - GtkScrolledWindow *scrolled_window; - gboolean widget_was_visible; - g_return_if_fail (container != NULL); g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container)); g_return_if_fail (child != NULL); - - scrolled_window = GTK_SCROLLED_WINDOW (container); - g_return_if_fail (scrolled_window->child == child); - - widget_was_visible = GTK_WIDGET_VISIBLE (child); + g_return_if_fail (GTK_BIN (container)->child == child); gtk_widget_scroll_adjustements (child, NULL, NULL); - gtk_widget_unparent (child); - scrolled_window->child = NULL; - - if (widget_was_visible) - gtk_widget_queue_resize (GTK_WIDGET (container)); + + /* chain parent class handler to remove child */ + GTK_CONTAINER_CLASS (parent_class)->remove (container, child); } void gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window, GtkWidget *child) { + GtkBin *bin; GtkWidget *viewport; g_return_if_fail (scrolled_window != NULL); @@ -869,12 +860,14 @@ gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window, g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (child->parent == NULL); - if (scrolled_window->child != NULL) + bin = GTK_BIN (scrolled_window); + + if (bin->child != NULL) { - g_return_if_fail (GTK_IS_VIEWPORT (scrolled_window->child)); - g_return_if_fail (GTK_BIN (scrolled_window->child)->child == NULL); + g_return_if_fail (GTK_IS_VIEWPORT (bin->child)); + g_return_if_fail (GTK_BIN (bin->child)->child == NULL); - viewport = scrolled_window->child; + viewport = bin->child; } else { diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index 1b74d69d5..df7fa6539 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -43,9 +43,8 @@ typedef struct _GtkScrolledWindowClass GtkScrolledWindowClass; struct _GtkScrolledWindow { - GtkContainer container; + GtkBin container; - GtkWidget *child; GtkWidget *hscrollbar; GtkWidget *vscrollbar; @@ -58,7 +57,7 @@ struct _GtkScrolledWindow struct _GtkScrolledWindowClass { - GtkContainerClass parent_class; + GtkBinClass parent_class; gint scrollbar_spacing; }; diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index c87557412..abef75f1a 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -141,11 +141,6 @@ void gtk_spin_button_set_shadow_type (GtkSpinButton *spin_button, void gtk_spin_button_set_snap_to_ticks (GtkSpinButton *spin_button, gboolean snap_to_ticks); - -void gtk_spin_button_configure (GtkSpinButton *spin_button, - GtkAdjustment *adjustment, - gfloat climb_rate, - guint digits); /* deprecated */ void gtk_spin_button_construct (GtkSpinButton *spin_button, GtkAdjustment *adjustment, diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 07e2ee743..4574cfe8f 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -286,9 +286,6 @@ static void gtk_style_shade (GdkColor *a, GdkColor *b, gdouble k); static void rgb_to_hls (gdouble *r, gdouble *g, gdouble *b); static void hls_to_rgb (gdouble *h, gdouble *l, gdouble *s); -static void gtk_reset_window_and_children(GtkWidget *widget, - GdkWindow *window); - GtkStyleClass default_class = { @@ -330,44 +327,6 @@ static GdkColor gtk_default_prelight_bg = { 0, 0xea60, 0xea60, 0xea60 }; static GdkColor gtk_default_selected_bg = { 0, 0, 0, 0x9c40 }; static GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 }; -static void -gtk_reset_window_and_children(GtkWidget *widget, GdkWindow *window) -{ - GdkWindowPrivate *private; - guint i, num; - GList *list; - gpointer data; - - g_return_if_fail (window != NULL); - - private = (GdkWindowPrivate *)window; - - if (private->destroyed) - return; - gdk_window_get_user_data(window, &data); - if ((data) && (data != widget)) - return; - gdk_window_shape_combine_mask(window, NULL, 0, 0); - if (private->children) - { - num = g_list_length(private->children); - for(i = 0; i < num; i++) - { - list = g_list_nth(private->children, i); - gtk_reset_window_and_children(widget, (GdkWindow *)list->data); - } - } -} - -void -gtk_reset_widget_shapes(GtkWidget *widget) -{ - g_return_if_fail (widget != NULL); - - if (!GTK_WIDGET_HAS_SHAPE_MASK(GTK_OBJECT(widget))) - gtk_reset_window_and_children(widget, widget->window); -} - GtkStyle* gtk_style_copy (GtkStyle *style) { diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 556722475..0a53beb2a 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -523,26 +523,6 @@ void gtk_draw_handle (GtkStyle *style, gint height, GtkOrientation orientation); -/* - * NEW API CALLS - * - * NEW API CALLS - * - * NEW API CALLS - * - * NEW API CALLS - * - * NEW API CALLS - * - * NEW API CALLS - * - * NEW API CALLS - * - * NEW API CALLS - * - */ - - void gtk_paint_hline (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -777,8 +757,6 @@ void gtk_paint_handle (GtkStyle *style, gint width, gint height, GtkOrientation orientation); - -void gtk_reset_widget_shapes(GtkWidget *widget); #ifdef __cplusplus } diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index d2482a0af..c0510d046 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -45,8 +45,8 @@ struct _GtkThemeEnginePrivate { static GHashTable *engine_hash = NULL; -GtkThemeEngine * -gtk_theme_engine_get (gchar *name) +GtkThemeEngine* +gtk_theme_engine_get (gchar *name) { GtkThemeEnginePrivate *result; @@ -64,10 +64,15 @@ gtk_theme_engine_get (gchar *name) GModule *library; g_snprintf (fullname, 1024, "lib%s.so", name); - engine_path = gtk_rc_find_module_in_path(NULL, fullname); + engine_path = gtk_rc_find_module_in_path (fullname); if (!engine_path) - return NULL; + { + g_warning ("Unable to locate loadable module in module_path: \"%s\",", + fullname); + + return NULL; + } /* load the lib */ diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 42fc9fbe8..b60425ce2 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -324,7 +324,7 @@ gtk_vscale_size_request (GtkWidget *widget, if (scale->draw_value) { - value_width = gtk_scale_value_width (scale); + value_width = gtk_scale_get_value_width (scale); if ((scale->value_pos == GTK_POS_LEFT) || (scale->value_pos == GTK_POS_RIGHT)) @@ -398,7 +398,7 @@ gtk_vscale_pos_trough (GtkVScale *vscale, switch (scale->value_pos) { case GTK_POS_LEFT: - *x = (gtk_scale_value_width (scale) + + *x = (gtk_scale_get_value_width (scale) + (widget->allocation.width - widget->requisition.width) / 2); break; case GTK_POS_RIGHT: diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 5dfd18441..2b1a80038 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -162,8 +162,6 @@ static void gtk_widget_reparent_container_child (GtkWidget *widget, gpointer client_data); static void gtk_widget_propagate_state (GtkWidget *widget, GtkStateData *data); -static void gtk_widget_draw_children_recurse (GtkWidget *widget, - gpointer client_data); static void gtk_widget_set_style_internal (GtkWidget *widget, GtkStyle *style, gboolean initial_emission); @@ -2217,26 +2215,6 @@ gtk_widget_draw_default (GtkWidget *widget) } /***************************************** - * gtk_widget_draw_children: - * - * arguments: - * - * results: - *****************************************/ - -void -gtk_widget_draw_children (GtkWidget *widget) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_WIDGET (widget)); - - if (GTK_IS_CONTAINER (widget)) - gtk_container_forall (GTK_CONTAINER (widget), - gtk_widget_draw_children_recurse, - NULL); -} - -/***************************************** * gtk_widget_size_request: * * arguments: @@ -3250,9 +3228,10 @@ gtk_widget_set_style_internal (GtkWidget *widget, GtkStyle *previous_style; if (GTK_WIDGET_REALIZED (widget)) - gtk_reset_widget_shapes(widget); - if (GTK_WIDGET_REALIZED (widget)) - gtk_style_detach (widget->style); + { + gtk_widget_reset_shapes (widget); + gtk_style_detach (widget->style); + } previous_style = widget->style; widget->style = style; @@ -3834,26 +3813,6 @@ gtk_widget_is_ancestor (GtkWidget *widget, } /***************************************** - * gtk_widget_is_child: - * - * arguments: - * - * results: - *****************************************/ - -gint -gtk_widget_is_child (GtkWidget *widget, - GtkWidget *child) -{ - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); - g_return_val_if_fail (child != NULL, FALSE); - g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE); - - return (child->parent == widget); -} - -/***************************************** * gtk_widget_push_colormap: * * arguments: @@ -4432,22 +4391,6 @@ gtk_widget_propagate_state (GtkWidget *widget, } /***************************************** - * gtk_widget_draw_children_recurse: - * - * arguments: - * - * results: - *****************************************/ - -static void -gtk_widget_draw_children_recurse (GtkWidget *widget, - gpointer client_data) -{ - gtk_widget_draw (widget, NULL); - gtk_widget_draw_children (widget); -} - -/***************************************** * gtk_widget_aux_info_new: * * arguments: @@ -4548,6 +4491,38 @@ gtk_widget_shape_combine_mask (GtkWidget *widget, } } +static void +gtk_reset_shapes_recurse (GtkWidget *widget, + GdkWindow *window) +{ + GdkWindowPrivate *private; + gpointer data; + GList *list; + + private = (GdkWindowPrivate*) window; + + if (private->destroyed) + return; + gdk_window_get_user_data (window, &data); + if (data != widget) + return; + + gdk_window_shape_combine_mask (window, NULL, 0, 0); + for (list = private->children; list; list = list->next) + gtk_reset_shapes_recurse (widget, list->data); +} + +void +gtk_widget_reset_shapes (GtkWidget *widget) +{ + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (GTK_WIDGET_REALIZED (widget)); + + if (!GTK_WIDGET_HAS_SHAPE_MASK (widget)) + gtk_reset_shapes_recurse (widget, widget->window); +} + void gtk_widget_ref (GtkWidget *widget) { diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 98d340cf2..9c135d8b2 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -444,7 +444,6 @@ void gtk_widget_draw (GtkWidget *widget, GdkRectangle *area); void gtk_widget_draw_focus (GtkWidget *widget); void gtk_widget_draw_default (GtkWidget *widget); -void gtk_widget_draw_children (GtkWidget *widget); void gtk_widget_size_request (GtkWidget *widget, GtkRequisition *requisition); void gtk_widget_size_allocate (GtkWidget *widget, @@ -526,8 +525,6 @@ void gtk_widget_get_pointer (GtkWidget *widget, gint gtk_widget_is_ancestor (GtkWidget *widget, GtkWidget *ancestor); -gint gtk_widget_is_child (GtkWidget *widget, - GtkWidget *child); /* Hide widget and return TRUE. */ @@ -577,6 +574,9 @@ void gtk_widget_shape_combine_mask (GtkWidget *widget, gint offset_x, gint offset_y); +/* internal function */ +void gtk_widget_reset_shapes (GtkWidget *widget); + /* Compute a widget's path in the form "GtkWindow.MyLabel", and * return newly alocated strings. */ diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index c8accc44e..6950dc871 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -246,7 +246,7 @@ gtk_window_set_arg (GtkObject *object, gtk_window_set_hints (GTK_WIDGET (window), >K_WIDGET (window)->requisition); break; case ARG_WIN_POS: - gtk_window_position (window, GTK_VALUE_ENUM (*arg)); + gtk_window_set_position (window, GTK_VALUE_ENUM (*arg)); break; default: break; @@ -407,8 +407,8 @@ gtk_window_remove_accel_group (GtkWindow *window, } void -gtk_window_position (GtkWindow *window, - GtkWindowPosition position) +gtk_window_set_position (GtkWindow *window, + GtkWindowPosition position) { g_return_if_fail (window != NULL); g_return_if_fail (GTK_IS_WINDOW (window)); diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 7f0b616d3..0b78adb8c 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -91,7 +91,7 @@ void gtk_window_add_accel_group (GtkWindow *window, GtkAccelGroup *accel_group); void gtk_window_remove_accel_group (GtkWindow *window, GtkAccelGroup *accel_group); -void gtk_window_position (GtkWindow *window, +void gtk_window_set_position (GtkWindow *window, GtkWindowPosition position); gint gtk_window_activate_focus (GtkWindow *window); gint gtk_window_activate_default (GtkWindow *window); diff --git a/gtk/testdnd.c b/gtk/testdnd.c index 2736bf393..a35dbd62e 100644 --- a/gtk/testdnd.c +++ b/gtk/testdnd.c @@ -445,7 +445,7 @@ popup_cb (gpointer data) int i, j; popup_window = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_position (GTK_WINDOW (popup_window), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (popup_window), GTK_WIN_POS_MOUSE); table = gtk_table_new (3,3, FALSE); diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 05bf83c98..1c23d15f9 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -150,7 +150,7 @@ create_buttons (void) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkButton"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); @@ -158,7 +158,7 @@ create_buttons (void) table = gtk_table_new (3, 3, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 5); gtk_table_set_col_spacings (GTK_TABLE (table), 5); - gtk_container_border_width (GTK_CONTAINER (table), 10); + gtk_container_set_border_width (GTK_CONTAINER (table), 10); gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); button[0] = gtk_button_new_with_label ("button1"); @@ -231,7 +231,7 @@ create_buttons (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button[9] = gtk_button_new_with_label ("close"); @@ -271,13 +271,13 @@ create_toggle_buttons (void) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkToggleButton"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); button = gtk_toggle_button_new_with_label ("button1"); @@ -293,7 +293,7 @@ create_toggle_buttons (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -333,13 +333,13 @@ create_check_buttons (void) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkCheckButton"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); button = gtk_check_button_new_with_label ("button1"); @@ -355,7 +355,7 @@ create_check_buttons (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -395,13 +395,13 @@ create_radio_buttons (void) &window); gtk_window_set_title (GTK_WINDOW (window), "radio buttons"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); button = gtk_radio_button_new_with_label (NULL, "button1"); @@ -422,7 +422,7 @@ create_radio_buttons (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -463,7 +463,7 @@ create_bbox (gint horizontal, else bbox = gtk_vbutton_box_new (); - gtk_container_border_width (GTK_CONTAINER (bbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout); @@ -501,7 +501,7 @@ create_button_box (void) GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window); - gtk_container_border_width (GTK_CONTAINER (window), 10); + gtk_container_set_border_width (GTK_CONTAINER (window), 10); main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), main_vbox); @@ -510,7 +510,7 @@ create_button_box (void) gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10); vbox = gtk_vbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (vbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_container_add (GTK_CONTAINER (frame_horz), vbox); gtk_box_pack_start (GTK_BOX (vbox), @@ -533,7 +533,7 @@ create_button_box (void) gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10); hbox = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 10); gtk_container_add (GTK_CONTAINER (frame_vert), hbox); gtk_box_pack_start (GTK_BOX (hbox), @@ -674,7 +674,7 @@ create_toolbar (void) GTK_SIGNAL_FUNC (gtk_widget_destroyed), &window); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_widget_realize (window); toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); @@ -930,13 +930,13 @@ create_statusbar (void) &window); gtk_window_set_title (GTK_WINDOW (window), "statusbar"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); statusbar = gtk_statusbar_new (); @@ -985,7 +985,7 @@ create_statusbar (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -1205,7 +1205,7 @@ create_tree_sample(guint selection_mode, /* create tree box */ box2 = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(box1), box2, TRUE, TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(box2), 5); + gtk_container_set_border_width(GTK_CONTAINER(box2), 5); gtk_widget_show(box2); /* create scrolled window */ @@ -1244,7 +1244,7 @@ create_tree_sample(guint selection_mode, box2 = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(box2), 5); + gtk_container_set_border_width(GTK_CONTAINER(box2), 5); gtk_widget_show(box2); button = gtk_button_new_with_label("Add Item"); @@ -1282,7 +1282,7 @@ create_tree_sample(guint selection_mode, /* create button box */ box2 = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(box2), 5); + gtk_container_set_border_width(GTK_CONTAINER(box2), 5); gtk_widget_show(box2); button = gtk_button_new_with_label("Close"); @@ -1363,7 +1363,7 @@ create_tree_mode_window(void) /* create upper box - selection box */ box2 = gtk_vbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(box1), box2, TRUE, TRUE, 0); - gtk_container_border_width(GTK_CONTAINER(box2), 5); + gtk_container_set_border_width(GTK_CONTAINER(box2), 5); box3 = gtk_hbox_new(FALSE, 5); gtk_box_pack_start(GTK_BOX(box2), box3, TRUE, TRUE, 0); @@ -1374,7 +1374,7 @@ create_tree_mode_window(void) box4 = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), box4); - gtk_container_border_width(GTK_CONTAINER(box4), 5); + gtk_container_set_border_width(GTK_CONTAINER(box4), 5); /* create radio button */ button = gtk_radio_button_new_with_label(NULL, "SINGLE"); @@ -1399,7 +1399,7 @@ create_tree_mode_window(void) box4 = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(frame), box4); - gtk_container_border_width(GTK_CONTAINER(box4), 5); + gtk_container_set_border_width(GTK_CONTAINER(box4), 5); /* create check button */ button = gtk_check_button_new_with_label("Draw line"); @@ -1422,7 +1422,7 @@ create_tree_mode_window(void) box4 = gtk_hbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(frame), box4); - gtk_container_border_width(GTK_CONTAINER(box4), 5); + gtk_container_set_border_width(GTK_CONTAINER(box4), 5); /* create number of item spin button */ box5 = gtk_hbox_new(FALSE, 5); @@ -1459,7 +1459,7 @@ create_tree_mode_window(void) /* create bottom button box */ box2 = gtk_hbox_new(TRUE, 10); gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0); - gtk_container_border_width(GTK_CONTAINER(box2), 5); + gtk_container_set_border_width(GTK_CONTAINER(box2), 5); button = gtk_button_new_with_label("Create Tree"); gtk_box_pack_start(GTK_BOX(box2), button, TRUE, TRUE, 0); @@ -1519,7 +1519,7 @@ create_handle_box (void) GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window); - gtk_container_border_width (GTK_CONTAINER (window), 20); + gtk_container_set_border_width (GTK_CONTAINER (window), 20); vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), vbox); @@ -1645,13 +1645,13 @@ create_reparent (void) &window); gtk_window_set_title (GTK_WINDOW (window), "reparent"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); label = gtk_label_new ("Hello World"); @@ -1660,7 +1660,7 @@ create_reparent (void) gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE, 0); box3 = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box3), 5); + gtk_container_set_border_width (GTK_CONTAINER (box3), 5); gtk_container_add (GTK_CONTAINER (frame), box3); button = gtk_button_new_with_label ("switch"); @@ -1680,7 +1680,7 @@ create_reparent (void) gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE, 0); box3 = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box3), 5); + gtk_container_set_border_width (GTK_CONTAINER (box3), 5); gtk_container_add (GTK_CONTAINER (frame), box3); button = gtk_button_new_with_label ("switch"); @@ -1694,7 +1694,7 @@ create_reparent (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -1766,7 +1766,7 @@ create_saved_position (void) &window); main_vbox = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (main_vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); gtk_container_add (GTK_CONTAINER (window), main_vbox); vbox = @@ -1779,7 +1779,7 @@ create_saved_position (void) NULL); hbox = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); label = gtk_label_new ("X Origin : "); @@ -1791,7 +1791,7 @@ create_saved_position (void) gtk_object_set_data (GTK_OBJECT (window), "x", x_label); hbox = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); label = gtk_label_new ("Y Origin : "); @@ -1809,7 +1809,7 @@ create_saved_position (void) gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 10); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0); button = gtk_button_new_with_label ("Close"); @@ -1853,14 +1853,14 @@ create_pixmap (void) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkPixmap"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_widget_realize(window); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); button = gtk_button_new (); @@ -1874,7 +1874,7 @@ create_pixmap (void) label = gtk_label_new ("Pixmap\ntest"); box3 = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (box3), 2); + gtk_container_set_border_width (GTK_CONTAINER (box3), 2); gtk_container_add (GTK_CONTAINER (box3), pixmapwid); gtk_container_add (GTK_CONTAINER (box3), label); gtk_container_add (GTK_CONTAINER (button), box3); @@ -1883,7 +1883,7 @@ create_pixmap (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -1969,7 +1969,7 @@ create_tooltips (void) gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); button = gtk_toggle_button_new_with_label ("button1"); @@ -2037,7 +2037,7 @@ create_tooltips (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -2131,7 +2131,7 @@ create_menus (void) gtk_accel_group_attach (accel_group, GTK_OBJECT (window)); gtk_window_set_title (GTK_WINDOW (window), "menus"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); @@ -2161,7 +2161,7 @@ create_menus (void) gtk_widget_show (menuitem); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); gtk_widget_show (box2); @@ -2201,7 +2201,7 @@ create_menus (void) GDK_F3, 0, GTK_ACCEL_VISIBLE); - gtk_widget_freeze_accelerators (menuitem); + gtk_widget_lock_accelerators (menuitem); optionmenu = gtk_option_menu_new (); gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu); @@ -2214,7 +2214,7 @@ create_menus (void) gtk_widget_show (separator); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); @@ -2298,7 +2298,7 @@ create_item_factory (void) gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, NULL); gtk_accel_group_attach (accel_group, GTK_OBJECT (window)); gtk_window_set_title (GTK_WINDOW (window), "Item Factory"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); @@ -2318,7 +2318,7 @@ create_item_factory (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -2450,8 +2450,8 @@ create_modal_window (void) btnClose = gtk_button_new_with_label ("Close"); /* Init widgets */ - gtk_container_border_width (GTK_CONTAINER(box1),3); - gtk_container_border_width (GTK_CONTAINER(box2),3); + gtk_container_set_border_width (GTK_CONTAINER(box1),3); + gtk_container_set_border_width (GTK_CONTAINER(box2),3); /* Pack widgets */ gtk_container_add (GTK_CONTAINER (window), box1); @@ -2505,11 +2505,11 @@ create_scrolled_windows (void) &window); gtk_window_set_title (GTK_WINDOW (window), "dialog"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_container_border_width (GTK_CONTAINER (scrolled_window), 10); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -2626,7 +2626,7 @@ create_entry (void) &window); gtk_window_set_title (GTK_WINDOW (window), "entry"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); @@ -2635,7 +2635,7 @@ create_entry (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); gtk_widget_show (box2); @@ -2680,7 +2680,7 @@ create_entry (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); @@ -2770,14 +2770,14 @@ create_spins (void) gtk_window_set_title (GTK_WINDOW (window), "GtkSpinButton"); main_vbox = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (main_vbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 10); gtk_container_add (GTK_CONTAINER (window), main_vbox); frame = gtk_frame_new ("Not accelerated"); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); vbox = gtk_vbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_container_add (GTK_CONTAINER (frame), vbox); /* Day, month, year spinners */ @@ -2835,7 +2835,7 @@ create_spins (void) gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); vbox = gtk_vbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_container_add (GTK_CONTAINER (frame), vbox); hbox = gtk_hbox_new (FALSE, 0); @@ -3046,7 +3046,7 @@ create_cursors (void) gtk_window_set_title (GTK_WINDOW (window), "Cursors"); main_vbox = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (main_vbox), 0); + gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); gtk_container_add (GTK_CONTAINER (window), main_vbox); vbox = @@ -3059,7 +3059,7 @@ create_cursors (void) NULL); hbox = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); label = gtk_label_new ("Cursor Value : "); @@ -3118,7 +3118,7 @@ create_cursors (void) gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 10); gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0); button = gtk_button_new_with_label ("Close"); @@ -3246,13 +3246,13 @@ create_list (void) &window); gtk_window_set_title (GTK_WINDOW (window), "list"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); scrolled_win = gtk_scrolled_window_new (NULL, NULL); @@ -3370,7 +3370,7 @@ create_list (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -3890,13 +3890,13 @@ create_clist (void) GTK_SIGNAL_FUNC (gtk_widget_destroyed), &window); gtk_window_set_title (GTK_WINDOW (window), "clist"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_hbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0); /* create GtkCList here so we have a pointer to throw at the @@ -3939,7 +3939,7 @@ create_clist (void) /* second layer of buttons */ box2 = gtk_hbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0); button = gtk_button_new_with_label ("Insert Row"); @@ -3967,7 +3967,7 @@ create_clist (void) (GtkSignalFunc) clist_warning_test,(gpointer) clist); box2 = gtk_hbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0); undo_button = gtk_button_new_with_label ("Undo last selection"); @@ -3983,7 +3983,7 @@ create_clist (void) /* vbox for the list itself */ box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); /* @@ -4060,14 +4060,14 @@ create_clist (void) } } - gtk_container_border_width (GTK_CONTAINER (scrolled_win), 5); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 5); gtk_box_pack_start (GTK_BOX (box2), scrolled_win, TRUE, TRUE, 0); separator = gtk_hseparator_new (); gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); @@ -4427,7 +4427,7 @@ void export_ctree (GtkWidget *widget, GtkCTree *ctree) &export_window); gtk_window_set_title (GTK_WINDOW (export_window), "exported ctree"); - gtk_container_border_width (GTK_CONTAINER (export_window), 5); + gtk_container_set_border_width (GTK_CONTAINER (export_window), 5); vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (export_window), vbox); @@ -4777,7 +4777,7 @@ void create_ctree (void) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkCTree"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); tooltips = gtk_tooltips_new (); gtk_object_ref (GTK_OBJECT (tooltips)); @@ -4790,7 +4790,7 @@ void create_ctree (void) gtk_container_add (GTK_CONTAINER (window), vbox); hbox = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (hbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); label = gtk_label_new ("Depth :"); @@ -4860,14 +4860,14 @@ void create_ctree (void) gtk_container_add (GTK_CONTAINER (scrolled_win), GTK_WIDGET (ctree)); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_container_border_width (GTK_CONTAINER (scrolled_win), 5); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 5); gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE, 0); gtk_clist_set_selection_mode (GTK_CLIST (ctree), GTK_SELECTION_EXTENDED); gtk_clist_set_column_auto_resize (GTK_CLIST (ctree), 0, TRUE); gtk_clist_set_column_width (GTK_CLIST (ctree), 1, 200); bbox = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (bbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, TRUE, 0); mbox = gtk_vbox_new (TRUE, 5); @@ -4994,12 +4994,12 @@ void create_ctree (void) gtk_widget_set_usize (GTK_WIDGET (ctree), 0, 300); frame = gtk_frame_new (NULL); - gtk_container_border_width (GTK_CONTAINER (frame), 0); + gtk_container_set_border_width (GTK_CONTAINER (frame), 0); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); hbox = gtk_hbox_new (TRUE, 2); - gtk_container_border_width (GTK_CONTAINER (hbox), 2); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); gtk_container_add (GTK_CONTAINER (frame), hbox); frame = gtk_frame_new (NULL); @@ -5007,7 +5007,7 @@ void create_ctree (void) gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); hbox2 = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox2), 2); + gtk_container_set_border_width (GTK_CONTAINER (hbox2), 2); gtk_container_add (GTK_CONTAINER (frame), hbox2); label = gtk_label_new ("Books :"); @@ -5022,7 +5022,7 @@ void create_ctree (void) gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); hbox2 = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox2), 2); + gtk_container_set_border_width (GTK_CONTAINER (hbox2), 2); gtk_container_add (GTK_CONTAINER (frame), hbox2); label = gtk_label_new ("Pages :"); @@ -5037,7 +5037,7 @@ void create_ctree (void) gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); hbox2 = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox2), 2); + gtk_container_set_border_width (GTK_CONTAINER (hbox2), 2); gtk_container_add (GTK_CONTAINER (frame), hbox2); label = gtk_label_new ("Selected :"); @@ -5052,7 +5052,7 @@ void create_ctree (void) gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0); hbox2 = gtk_hbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (hbox2), 2); + gtk_container_set_border_width (GTK_CONTAINER (hbox2), 2); gtk_container_add (GTK_CONTAINER (frame), hbox2); label = gtk_label_new ("Visible :"); @@ -5116,7 +5116,7 @@ create_color_selection (void) GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (window)->colorsel), GTK_UPDATE_CONTINUOUS); - gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), @@ -5178,7 +5178,7 @@ create_file_selection (void) gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (window)); - gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), @@ -5235,7 +5235,7 @@ create_font_selection (void) { window = gtk_font_selection_dialog_new ("Font Selection Dialog"); - gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); + gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), @@ -5296,7 +5296,7 @@ create_dialog (void) &dialog_window); gtk_window_set_title (GTK_WINDOW (dialog_window), "GtkDialog"); - gtk_container_border_width (GTK_CONTAINER (dialog_window), 0); + gtk_container_set_border_width (GTK_CONTAINER (dialog_window), 0); gtk_widget_set_usize (dialog_window, 200, 110); button = gtk_button_new_with_label ("OK"); @@ -5349,7 +5349,7 @@ create_range_controls (void) &window); gtk_window_set_title (GTK_WINDOW (window), "range controls"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); @@ -5358,7 +5358,7 @@ create_range_controls (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); gtk_widget_show (box2); @@ -5386,7 +5386,7 @@ create_range_controls (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); @@ -5432,7 +5432,7 @@ create_rulers (void) gtk_widget_set_events (window, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); table = gtk_table_new (2, 2, FALSE); gtk_container_add (GTK_CONTAINER (window), table); @@ -5554,7 +5554,7 @@ create_text (void) &window); gtk_window_set_title (GTK_WINDOW (window), "test"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); @@ -5563,7 +5563,7 @@ create_text (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); gtk_widget_show (box2); @@ -5662,7 +5662,7 @@ create_text (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); @@ -5784,10 +5784,10 @@ create_pages (GtkNotebook *notebook, gint start, gint end) sprintf (buffer, "Page %d", i); child = gtk_frame_new (buffer); - gtk_container_border_width (GTK_CONTAINER (child), 10); + gtk_container_set_border_width (GTK_CONTAINER (child), 10); vbox = gtk_vbox_new (TRUE,0); - gtk_container_border_width (GTK_CONTAINER (vbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_container_add (GTK_CONTAINER (child), vbox); hbox = gtk_hbox_new (TRUE,0); @@ -5931,7 +5931,7 @@ create_notebook (void) &window); gtk_window_set_title (GTK_WINDOW (window), "notebook"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); @@ -5941,7 +5941,7 @@ create_notebook (void) GTK_SIGNAL_FUNC (page_switch), NULL); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (sample_notebook), GTK_POS_TOP); gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE, TRUE, 0); - gtk_container_border_width (GTK_CONTAINER (sample_notebook), 10); + gtk_container_set_border_width (GTK_CONTAINER (sample_notebook), 10); gtk_widget_realize (sample_notebook); book_open = gdk_pixmap_create_from_xpm_d (sample_notebook->window, @@ -5959,7 +5959,7 @@ create_notebook (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 10); box2 = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_check_button_new_with_label ("popup menu"); @@ -5975,7 +5975,7 @@ create_notebook (void) GTK_OBJECT (sample_notebook)); box2 = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); label = gtk_label_new ("Notebook Style :"); @@ -5990,7 +5990,7 @@ create_notebook (void) GTK_SIGNAL_FUNC (show_all_pages), sample_notebook); box2 = gtk_hbox_new (TRUE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("prev"); @@ -6014,7 +6014,7 @@ create_notebook (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5); button = gtk_button_new_with_label ("close"); - gtk_container_border_width (GTK_CONTAINER (button), 5); + gtk_container_set_border_width (GTK_CONTAINER (button), 5); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (window)); @@ -6051,11 +6051,11 @@ create_panes (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Panes"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); vpaned = gtk_vpaned_new (); gtk_container_add (GTK_CONTAINER (window), vpaned); - gtk_container_border_width (GTK_CONTAINER(vpaned), 5); + gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5); gtk_widget_show (vpaned); hpaned = gtk_hpaned_new (); @@ -6124,7 +6124,7 @@ dnd_drop (GtkWidget *button, GdkEvent *event) return; window = gtk_window_new(GTK_WINDOW_DIALOG); - gtk_container_border_width (GTK_CONTAINER(window), 10); + gtk_container_set_border_width (GTK_CONTAINER(window), 10); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(dnd_drop_destroy_popup), @@ -6227,14 +6227,14 @@ create_dnd (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Drag -N- Drop"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (window), box1); gtk_widget_show (box1); box2 = gtk_hbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0); gtk_widget_show (box2); @@ -6243,7 +6243,7 @@ create_dnd (void) gtk_widget_show (frame); box3 = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box3), 5); + gtk_container_set_border_width (GTK_CONTAINER (box3), 5); gtk_container_add (GTK_CONTAINER (frame), box3); gtk_widget_show (box3); @@ -6272,7 +6272,7 @@ create_dnd (void) gtk_widget_show (frame); box3 = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (box3), 5); + gtk_container_set_border_width (GTK_CONTAINER (box3), 5); gtk_container_add (GTK_CONTAINER (frame), box3); gtk_widget_show (box3); @@ -6299,7 +6299,7 @@ create_dnd (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); @@ -6514,7 +6514,7 @@ create_wmhints (void) &window); gtk_window_set_title (GTK_WINDOW (window), "WM Hints"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_widget_realize (window); @@ -6546,7 +6546,7 @@ create_wmhints (void) box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_widget_show (box2); @@ -6774,10 +6774,10 @@ create_progress_bar (void) pdata->timer = 0; gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar"); - gtk_container_border_width (GTK_CONTAINER (pdata->window), 0); + gtk_container_set_border_width (GTK_CONTAINER (pdata->window), 0); vbox = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (vbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (pdata->window)->vbox), vbox, FALSE, TRUE, 0); @@ -7033,7 +7033,7 @@ create_color_preview (void) &window); gtk_window_set_title (GTK_WINDOW (window), "test"); - gtk_container_border_width (GTK_CONTAINER (window), 10); + gtk_container_set_border_width (GTK_CONTAINER (window), 10); preview = gtk_preview_new (GTK_PREVIEW_COLOR); gtk_preview_size (GTK_PREVIEW (preview), 256, 256); @@ -7116,7 +7116,7 @@ create_gray_preview (void) &window); gtk_window_set_title (GTK_WINDOW (window), "test"); - gtk_container_border_width (GTK_CONTAINER (window), 10); + gtk_container_set_border_width (GTK_CONTAINER (window), 10); preview = gtk_preview_new (GTK_PREVIEW_GRAYSCALE); gtk_preview_size (GTK_PREVIEW (preview), 256, 256); @@ -7225,12 +7225,12 @@ create_selection_test (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Selection Test"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); /* Create the list */ vbox = gtk_vbox_new (FALSE, 5); - gtk_container_border_width (GTK_CONTAINER (vbox), 10); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0); @@ -7290,7 +7290,7 @@ create_gamma_curve (void) { window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "test"); - gtk_container_border_width (GTK_CONTAINER (window), 10); + gtk_container_set_border_width (GTK_CONTAINER (window), 10); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), @@ -7460,7 +7460,7 @@ create_scroll_test (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Scroll Test"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), hbox, @@ -7573,7 +7573,7 @@ create_timeout_test (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Timeout Test"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); label = gtk_label_new ("count: 0"); gtk_misc_set_padding (GTK_MISC (label), 10, 10); @@ -7691,7 +7691,7 @@ create_idle_test (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Idle Test"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); label = gtk_label_new ("count: 0"); gtk_misc_set_padding (GTK_MISC (label), 10, 10); @@ -7843,7 +7843,7 @@ create_rc_file (void) &window); gtk_window_set_title (GTK_WINDOW (window), "Reload Rc file"); - gtk_container_border_width (GTK_CONTAINER (window), 0); + gtk_container_set_border_width (GTK_CONTAINER (window), 0); button = gtk_button_new_with_label ("Reload"); gtk_signal_connect (GTK_OBJECT (button), "clicked", @@ -8147,14 +8147,14 @@ create_main_window (void) gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0); scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_container_border_width (GTK_CONTAINER (scrolled_window), 10); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 0); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), box2); gtk_container_set_focus_vadjustment (GTK_CONTAINER (box2), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); @@ -8177,7 +8177,7 @@ create_main_window (void) gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); box2 = gtk_vbox_new (FALSE, 10); - gtk_container_border_width (GTK_CONTAINER (box2), 10); + gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); button = gtk_button_new_with_label ("close"); diff --git a/gtk/testselection.c b/gtk/testselection.c index bcb6c57bb..e88d44347 100644 --- a/gtk/testselection.c +++ b/gtk/testselection.c @@ -396,13 +396,13 @@ main (int argc, char *argv[]) dialog = gtk_dialog_new (); gtk_widget_set_name (dialog, "Test Input"); - gtk_container_border_width (GTK_CONTAINER(dialog), 0); + gtk_container_set_border_width (GTK_CONTAINER(dialog), 0); gtk_signal_connect (GTK_OBJECT (dialog), "destroy", GTK_SIGNAL_FUNC (quit), NULL); table = gtk_table_new (4, 2, FALSE); - gtk_container_border_width (GTK_CONTAINER(table), 10); + gtk_container_set_border_width (GTK_CONTAINER(table), 10); gtk_table_set_row_spacing (GTK_TABLE (table), 0, 5); gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2); |