[dia/dia-next: 23/59] Use GtkBox directly instead of GtkH/VBox
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/dia-next: 23/59] Use GtkBox directly instead of GtkH/VBox
- Date: Wed, 9 Jan 2019 18:36:14 +0000 (UTC)
commit d6a0c30420f2cd85a06665e6803910458867b64c
Author: Zander Brown <zbrown gnome org>
Date: Mon Dec 24 13:19:50 2018 +0000
Use GtkBox directly instead of GtkH/VBox
app/diapagelayout.c | 4 ++--
app/exit_dialog.c | 2 +-
app/filedlg.c | 4 ++--
app/find-and-replace.c | 4 ++--
app/interface.c | 18 +++++++++---------
app/layer_dialog.c | 15 ++++++++-------
app/linewidth_area.c | 2 +-
app/menus.c | 2 +-
app/splash.c | 2 +-
app/toolbox.c | 4 ++--
lib/diaarrowselector.c | 17 ++++++++++-------
lib/diacolorselector.c | 9 ++++++---
lib/dialinestyleselector.c | 11 +++++++----
lib/dialogs.c | 2 +-
lib/diapatternselector.c | 9 ++++++---
lib/prop_matrix.c | 2 +-
lib/prop_sdarray_widget.c | 8 ++++----
lib/propdialogs.c | 4 ++--
lib/widgets.c | 18 ++++++++++++------
objects/AADL/edit_port_declaration.c | 2 +-
objects/UML/class_attributes_dialog.c | 10 +++++-----
objects/UML/class_dialog.c | 24 +++++++++++++-----------
objects/UML/class_operations_dialog.c | 27 ++++++++++++++-------------
objects/UML/class_templates_dialog.c | 10 +++++-----
plug-ins/xslt/xsltdialog.c | 4 ++--
25 files changed, 118 insertions(+), 96 deletions(-)
---
diff --git a/app/diapagelayout.c b/app/diapagelayout.c
index 2034fb13..3db63aca 100644
--- a/app/diapagelayout.c
+++ b/app/diapagelayout.c
@@ -158,7 +158,7 @@ dia_page_layout_init(DiaPageLayout *self)
GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show(frame);
- box = gtk_vbox_new(FALSE, 5);
+ box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width(GTK_CONTAINER(box), 5);
gtk_container_add(GTK_CONTAINER(frame), box);
gtk_widget_show(box);
@@ -187,7 +187,7 @@ dia_page_layout_init(DiaPageLayout *self)
GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
gtk_widget_show(frame);
- box = gtk_hbox_new(FALSE, 5);
+ box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_container_set_border_width(GTK_CONTAINER(box), 5);
gtk_container_add(GTK_CONTAINER(frame), box);
gtk_widget_show(box);
diff --git a/app/exit_dialog.c b/app/exit_dialog.c
index e4c5decc..f48fa861 100644
--- a/app/exit_dialog.c
+++ b/app/exit_dialog.c
@@ -137,7 +137,7 @@ exit_dialog_make (GtkWindow * parent_window,
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled), GTK_WIDGET (treeview));
- hbox = gtk_hbox_new (FALSE, 3);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
diff --git a/app/filedlg.c b/app/filedlg.c
index 3a09ac88..2f21e5fa 100644
--- a/app/filedlg.c
+++ b/app/filedlg.c
@@ -310,7 +310,7 @@ file_open_callback(GtkAction *action)
options = gtk_frame_new(_("Open Options"));
gtk_frame_set_shadow_type(GTK_FRAME(options), GTK_SHADOW_ETCHED_IN);
- hbox = gtk_hbox_new(FALSE, 1);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
gtk_container_add(GTK_CONTAINER(options), hbox);
gtk_widget_show(hbox);
@@ -767,7 +767,7 @@ file_export_callback(GtkAction *action)
options = gtk_frame_new(_("Export Options"));
gtk_frame_set_shadow_type(GTK_FRAME(options), GTK_SHADOW_ETCHED_IN);
- hbox = gtk_hbox_new(FALSE, 1);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 5);
gtk_container_add(GTK_CONTAINER(options), hbox);
gtk_widget_show(hbox);
diff --git a/app/find-and-replace.c b/app/find-and-replace.c
index 3961ee5d..07b6c273 100644
--- a/app/find-and-replace.c
+++ b/app/find-and-replace.c
@@ -476,7 +476,7 @@ fnr_dialog_setup_common (GtkWidget *dialog, gboolean is_replace, DDisplay *ddisp
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
label = gtk_label_new_with_mnemonic (_("_Search for:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
search_entry = gtk_entry_new ();
@@ -489,7 +489,7 @@ fnr_dialog_setup_common (GtkWidget *dialog, gboolean is_replace, DDisplay *ddisp
if (is_replace) {
GtkWidget *replace_entry;
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
label = gtk_label_new_with_mnemonic (_("Replace _with:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
replace_entry = gtk_entry_new ();
diff --git a/app/interface.c b/app/interface.c
index 8632c47b..754f2234 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -243,7 +243,7 @@ create_zoom_widget(DDisplay *ddisp) {
GtkWidget *button;
GtkWidget *arrow;
- combo = gtk_hbox_new(FALSE, 0);
+ combo = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
entry = gtk_entry_new();
g_signal_connect (G_OBJECT (entry), "activate",
G_CALLBACK(zoom_activate_callback),
@@ -596,12 +596,12 @@ use_integrated_ui_for_display_shell(DDisplay *ddisp, char *title)
ddisp->shell = GTK_WIDGET (ui.main_window);
ddisp->modified_status = GTK_WIDGET (ui.statusbar);
- tab_label_container = gtk_hbox_new(FALSE,3);
+ tab_label_container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
label = gtk_label_new( title );
gtk_box_pack_start( GTK_BOX(tab_label_container), label, FALSE, FALSE, 0 );
gtk_widget_show (label);
/* Create a new tab page */
- ddisp->container = gtk_vbox_new(FALSE, 0);
+ ddisp->container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
/* <from GEdit> */
/* don't allow focus on the close button */
@@ -759,7 +759,7 @@ create_display_shell(DDisplay *ddisp,
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
if (use_mbar)
{
- root_vbox = gtk_vbox_new (FALSE, 1);
+ root_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
gtk_container_add (GTK_CONTAINER (ddisp->shell), root_vbox);
gtk_box_pack_end (GTK_BOX (root_vbox), table, TRUE, TRUE, 0);
}
@@ -809,11 +809,11 @@ create_display_shell(DDisplay *ddisp,
}
/* the statusbars */
- status_hbox = gtk_hbox_new (FALSE, 2);
+ status_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
/* Zoom status pseudo-optionmenu */
ddisp->zoom_status = create_zoom_widget(ddisp);
- zoom_hbox = gtk_hbox_new(FALSE, 0);
+ zoom_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
zoom_label = gtk_label_new(_("Zoom"));
gtk_box_pack_start (GTK_BOX(zoom_hbox), zoom_label,
FALSE, FALSE, 0);
@@ -1045,7 +1045,7 @@ create_integrated_ui (void)
G_CALLBACK (toolbox_destroy),
window);
- main_vbox = gtk_vbox_new (FALSE, 1);
+ main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
gtk_container_add (GTK_CONTAINER (window), main_vbox);
gtk_widget_show (main_vbox);
@@ -1054,7 +1054,7 @@ create_integrated_ui (void)
statusbar = gtk_statusbar_new ();
gtk_box_pack_end (GTK_BOX (main_vbox), statusbar, FALSE, TRUE, 0);
/* HBox for everything below the menubar and toolbars */
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_end (GTK_BOX (main_vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
@@ -1143,7 +1143,7 @@ create_toolbox ()
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (toolbox_destroy), window);
- main_vbox = gtk_vbox_new (FALSE, 1);
+ main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
gtk_container_add (GTK_CONTAINER (window), main_vbox);
diff --git a/app/layer_dialog.c b/app/layer_dialog.c
index b2c374ec..c06f5ea3 100644
--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -191,7 +191,8 @@ create_button_box(GtkWidget *parent, gboolean show_labels)
GtkWidget *button_box;
int i;
- button_box = gtk_hbox_new (TRUE, 1);
+ button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
+ gtk_box_set_homogeneous (GTK_BOX (button_box), TRUE);
for (i=0;i<num_buttons;i++) {
if (show_labels == TRUE)
@@ -298,9 +299,9 @@ GtkWidget * create_layer_view_widget (void)
layer_dialog->diagram = NULL;
- layer_dialog->dialog = vbox = gtk_vbox_new (FALSE, 1);
+ layer_dialog->dialog = vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
- hbox = gtk_hbox_new (FALSE, 1);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
label = gtk_label_new (_ ("Layers:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 2);
@@ -391,7 +392,7 @@ layer_dialog_create(void)
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- hbox = gtk_hbox_new(FALSE, 1);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
label = gtk_label_new(_("Diagram:"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
@@ -895,7 +896,7 @@ dia_layer_widget_init(DiaLayerWidget *lw)
GtkWidget *connectable;
GtkWidget *label;
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
lw->dia = NULL;
lw->layer = NULL;
@@ -1150,12 +1151,12 @@ layer_dialog_edit_layer (DiaLayerWidget *layer_widget, Diagram *dia, Layer *laye
&dialog->dialog);
/* the main vbox */
- vbox = gtk_vbox_new (FALSE, 1);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), vbox, TRUE, TRUE,
0);
/* the name entry hbox, label and entry */
- hbox = gtk_hbox_new (FALSE, 1);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Layer name:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
diff --git a/app/linewidth_area.c b/app/linewidth_area.c
index 326e66ec..cb95bc54 100644
--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -233,7 +233,7 @@ linewidth_create_dialog(GtkWindow *toplevel)
gtk_window_set_resizable (GTK_WINDOW (linewidth_dialog), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (linewidth_dialog), 2);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
label = gtk_label_new(_("Line width:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
diff --git a/app/menus.c b/app/menus.c
index 59ee1d9e..ef9d8126 100644
--- a/app/menus.c
+++ b/app/menus.c
@@ -464,7 +464,7 @@ static void integrated_ui_toolbar_add_custom_item (GtkToolbar *toolbar, GtkWidge
GtkWidget *c; /* container */
tool_item = gtk_tool_item_new ();
- c = gtk_vbox_new (FALSE, 0);
+ c = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (tool_item), c);
gtk_box_set_homogeneous (GTK_BOX (c), TRUE); /* Centers the button */
gtk_box_pack_start (GTK_BOX (c), w, FALSE, FALSE, 0);
diff --git a/app/splash.c b/app/splash.c
index b58f2a99..0405f2e6 100644
--- a/app/splash.c
+++ b/app/splash.c
@@ -51,7 +51,7 @@ app_splash_init (const gchar* fname)
gtk_window_set_resizable (GTK_WINDOW (splash), FALSE);
gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
- vbox = gtk_vbox_new (FALSE, 2);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_add (GTK_CONTAINER(splash), vbox);
diff --git a/app/toolbox.c b/app/toolbox.c
index c28aeb76..3c3a986c 100644
--- a/app/toolbox.c
+++ b/app/toolbox.c
@@ -497,7 +497,7 @@ create_sheets(GtkWidget *parent)
separator = gtk_hseparator_new ();
/* add a bit of padding around the separator */
- label = gtk_vbox_new(FALSE, 0);
+ label = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(label), separator, TRUE, TRUE, 3);
gtk_widget_show(label);
@@ -543,7 +543,7 @@ create_color_area (GtkWidget *parent)
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
gtk_wrap_box_pack_wrapped(GTK_WRAP_BOX(parent), frame, TRUE, TRUE, FALSE, FALSE, TRUE);
- hbox = gtk_hbox_new (FALSE, 1);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
gtk_container_add (GTK_CONTAINER (frame), hbox);
diff --git a/lib/diaarrowselector.c b/lib/diaarrowselector.c
index 9812f09f..220bdd75 100644
--- a/lib/diaarrowselector.c
+++ b/lib/diaarrowselector.c
@@ -31,9 +31,9 @@
/* FIXME: Should these structs be in widgets.h instead? */
struct _DiaArrowSelector
{
- GtkVBox vbox;
+ GtkBox vbox;
- GtkHBox *sizebox;
+ GtkBox *sizebox;
GtkLabel *sizelabel;
DiaSizeSelector *size;
@@ -42,7 +42,7 @@ struct _DiaArrowSelector
struct _DiaArrowSelectorClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
};
enum {
@@ -115,8 +115,11 @@ dia_arrow_selector_init (DiaArrowSelector *as,
GtkWidget *box;
GtkWidget *label;
GtkWidget *size;
-
GList *arrow_names = get_arrow_names();
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (as),
+ GTK_ORIENTATION_VERTICAL);
+
as->omenu =
omenu = dia_dynamic_menu_new_listbased(create_arrow_menu_item,
as,
@@ -134,8 +137,8 @@ dia_arrow_selector_init (DiaArrowSelector *as,
"value-changed", G_CALLBACK(arrow_type_change_callback),
as);
- box = gtk_hbox_new(FALSE,0);
- as->sizebox = GTK_HBOX(box);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ as->sizebox = GTK_BOX (box);
label = gtk_label_new(_("Size: "));
as->sizelabel = GTK_LABEL(label);
@@ -173,7 +176,7 @@ dia_arrow_selector_get_type (void)
(GInstanceInitFunc)dia_arrow_selector_init, /* init */
};
- dfs_type = g_type_register_static (GTK_TYPE_VBOX,
+ dfs_type = g_type_register_static (GTK_TYPE_BOX,
"DiaArrowSelector",
&dfs_info, 0);
}
diff --git a/lib/diacolorselector.c b/lib/diacolorselector.c
index a41a7383..3e79d7a8 100644
--- a/lib/diacolorselector.c
+++ b/lib/diacolorselector.c
@@ -27,14 +27,14 @@
/************* DiaColorSelector: ***************/
struct _DiaColorSelector
{
- GtkHBox hbox; /* just contaning the other two widgets */
+ GtkBox hbox; /* just contaning the other two widgets */
DiaDynamicMenu *ddm; /* the widget previously alone */
GtkColorButton *color_button; /* to reflect alpha */
gboolean use_alpha;
};
struct _DiaColorSelectorClass
{
- GtkHBoxClass parent_class;
+ GtkBoxClass parent_class;
};
enum {
DIA_COLORSEL_VALUE_CHANGED,
@@ -86,6 +86,9 @@ dia_color_selector_value_changed (DiaDynamicMenu *ddm, gpointer user_data)
static void
dia_color_selector_init (DiaColorSelector *cs)
{
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (cs),
+ GTK_ORIENTATION_HORIZONTAL);
+
cs->ddm = DIA_DYNAMIC_MENU(dia_color_selector_menu_new(cs));
cs->color_button = GTK_COLOR_BUTTON (gtk_color_button_new ());
@@ -136,7 +139,7 @@ dia_color_selector_get_type (void)
(GInstanceInitFunc) dia_color_selector_init
};
- dcs_type = g_type_register_static (gtk_hbox_get_type (),
+ dcs_type = g_type_register_static (GTK_TYPE_BOX,
"DiaColorSelector",
&dcs_info, 0);
}
diff --git a/lib/dialinestyleselector.c b/lib/dialinestyleselector.c
index 1d5a34bf..7fa4abad 100644
--- a/lib/dialinestyleselector.c
+++ b/lib/dialinestyleselector.c
@@ -29,7 +29,7 @@
/************* DiaLineStyleSelector: ***************/
struct _DiaLineStyleSelector
{
- GtkVBox vbox;
+ GtkBox vbox;
GtkWidget *omenu;
GtkMenu *linestyle_menu;
@@ -40,7 +40,7 @@ struct _DiaLineStyleSelector
struct _DiaLineStyleSelectorClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
};
enum {
@@ -104,6 +104,9 @@ dia_line_style_selector_init (DiaLineStyleSelector *fs)
static const gchar *_line_style_names[LINESTYLE_DOTTED+1];
static gboolean once = FALSE;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (fs),
+ GTK_ORIENTATION_VERTICAL);
+
if (!once) {
_line_style_names[LINESTYLE_SOLID] = Q_("line|Solid");
_line_style_names[LINESTYLE_DASHED] = Q_("line|Dashed");
@@ -131,7 +134,7 @@ dia_line_style_selector_init (DiaLineStyleSelector *fs)
gtk_box_pack_start(GTK_BOX(fs), GTK_WIDGET(fs->omenu), FALSE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(fs->omenu));
- box = gtk_hbox_new(FALSE,0);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
/* fs->sizebox = GTK_HBOX(box); */
label = gtk_label_new(_("Dash length: "));
@@ -174,7 +177,7 @@ dia_line_style_selector_get_type (void)
(GInstanceInitFunc) dia_line_style_selector_init,
};
- dfs_type = g_type_register_static (gtk_vbox_get_type (),
+ dfs_type = g_type_register_static (GTK_TYPE_BOX,
"DiaLineStyleSelector",
&dfs_info, 0);
}
diff --git a/lib/dialogs.c b/lib/dialogs.c
index 1f2cc368..e4438a50 100644
--- a/lib/dialogs.c
+++ b/lib/dialogs.c
@@ -67,7 +67,7 @@ dialog_add_spinbutton(GtkWidget *dialog, char *title,
real min, real max, real decimals) {
GtkAdjustment *limits =
GTK_ADJUSTMENT(gtk_adjustment_new(10.0, min, max, 1.0, 10.0, 0));
- GtkWidget *box = gtk_hbox_new(FALSE, 10);
+ GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
GtkWidget *label = gtk_label_new(title);
GtkWidget *entry = gtk_spin_button_new(limits, 10.0, decimals);
diff --git a/lib/diapatternselector.c b/lib/diapatternselector.c
index 429bb0f0..47ff7f6d 100644
--- a/lib/diapatternselector.c
+++ b/lib/diapatternselector.c
@@ -29,7 +29,7 @@ typedef struct _DiaPatternSelector DiaPatternSelector;
typedef struct _DiaPatternSelectorClass DiaPatternSelectorClass;
struct _DiaPatternSelector
{
- GtkHBox hbox; /*!< just containing the other two widgets */
+ GtkBox hbox; /*!< just containing the other two widgets */
GtkWidget *state; /*!< button reflecting the state */
GtkWidget *menu_button; /*!< pop-up menu button to select presets */
@@ -37,7 +37,7 @@ struct _DiaPatternSelector
};
struct _DiaPatternSelectorClass
{
- GtkHBoxClass parent_class;
+ GtkBoxClass parent_class;
};
enum {
@@ -73,7 +73,7 @@ dia_pattern_selector_class_init (DiaPatternSelectorClass *klass)
static GType dia_pattern_selector_get_type (void);
-G_DEFINE_TYPE (DiaPatternSelector, dia_pattern_selector, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (DiaPatternSelector, dia_pattern_selector, GTK_TYPE_BOX);
/* GUI stuff - not completely done yet
- add/remove color stops
@@ -181,6 +181,9 @@ _popup_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data)
static void
dia_pattern_selector_init (DiaPatternSelector *ps)
{
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (ps),
+ GTK_ORIENTATION_HORIZONTAL);
+
ps->state = gtk_toggle_button_new_with_label(_("No"));
g_signal_connect(G_OBJECT(ps->state), "toggled",
G_CALLBACK (_pattern_toggled), ps);
diff --git a/lib/prop_matrix.c b/lib/prop_matrix.c
index 8c51ca01..1f77b212 100644
--- a/lib/prop_matrix.c
+++ b/lib/prop_matrix.c
@@ -169,7 +169,7 @@ matrixprop_get_widget (MatrixProperty *prop, PropDialog *dialog)
GtkWidget *ret, *sb;
int i;
- ret = gtk_hbox_new (FALSE,0);
+ ret = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
/* angle */
adj = GTK_ADJUSTMENT (gtk_adjustment_new(0.0, -180.0, 180.0, 1.0, 15.0, 0));
sb = gtk_spin_button_new(adj, 1.0, 2);
diff --git a/lib/prop_sdarray_widget.c b/lib/prop_sdarray_widget.c
index 683aab3c..e906ccd1 100644
--- a/lib/prop_sdarray_widget.c
+++ b/lib/prop_sdarray_widget.c
@@ -460,7 +460,7 @@ _make_button_box_for_view (GtkTreeView *view, GtkTreeView *master_view)
{ GTK_STOCK_GO_DOWN, G_CALLBACK (_lower_row_callback) },
{ NULL, NULL }
};
- GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
+ GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
GtkWidget *button;
int i;
@@ -538,7 +538,7 @@ _arrayprop_get_widget (ArrayProperty *prop, PropDialog *dialog)
* \- branch_view
*/
{
- GtkWidget *hbox = gtk_hbox_new (FALSE /* less size for button column */, 0);
+ GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *vbox = _make_button_box_for_view (GTK_TREE_VIEW (view), NULL);
gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE /* no expand */, FALSE, 0);
@@ -550,8 +550,8 @@ _arrayprop_get_widget (ArrayProperty *prop, PropDialog *dialog)
gtk_box_pack_start (GTK_BOX (hbox), _make_scrollable (view), TRUE /* expand */, TRUE /* fill */, 0);
} else {
/* almost the same once more */
- GtkWidget *hbox2 = gtk_hbox_new (FALSE /* less size for button column */, 0);
- GtkWidget *vbox2 = gtk_vbox_new (FALSE, 0);
+ GtkWidget *hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ GtkWidget *vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
GtkWidget *vbox3 = _make_button_box_for_view (GTK_TREE_VIEW (branch_view), GTK_TREE_VIEW (view));
gtk_box_pack_start (GTK_BOX (vbox2), _make_scrollable (view), TRUE, TRUE, 0);
diff --git a/lib/propdialogs.c b/lib/propdialogs.c
index b6856750..e25f6ab8 100644
--- a/lib/propdialogs.c
+++ b/lib/propdialogs.c
@@ -45,7 +45,7 @@ prop_dialog_new(GList *objects, gboolean is_default)
{
PropDialog *dialog = g_new0(PropDialog,1);
dialog->props = NULL;
- dialog->widget = gtk_vbox_new(FALSE,1);
+ dialog->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
dialog->prop_widgets = g_array_new(FALSE,TRUE,sizeof(PropWidgetAssoc));
dialog->copies = NULL;
dialog->curtable = NULL;
@@ -283,7 +283,7 @@ prop_dialog_add_properties(PropDialog *dialog, GPtrArray *props)
if (scrollable) {
GtkWidget *swin = gtk_scrolled_window_new (NULL, NULL);
- GtkWidget *vbox = gtk_vbox_new(FALSE,2);
+ GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_box_pack_start(GTK_BOX (dialog->widget), swin, TRUE, TRUE, 0);
gtk_widget_show (swin);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swin), vbox);
diff --git a/lib/widgets.c b/lib/widgets.c
index fc137d84..6bc93c4c 100644
--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -44,7 +44,7 @@
*/
struct _DiaSizeSelector
{
- GtkHBox hbox;
+ GtkBox hbox;
GtkSpinButton *width, *height;
GtkToggleButton *aspect_locked;
real ratio;
@@ -53,7 +53,7 @@ struct _DiaSizeSelector
struct _DiaSizeSelectorClass
{
- GtkHBoxClass parent_class;
+ GtkBoxClass parent_class;
};
enum {
@@ -150,6 +150,9 @@ dia_size_selector_init (DiaSizeSelector *ss)
{
GtkAdjustment *adj;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (ss),
+ GTK_ORIENTATION_HORIZONTAL);
+
ss->ratio = 0.0;
/* Here's where we set up the real thing */
adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.01, 10,
@@ -212,7 +215,7 @@ dia_size_selector_get_type (void)
(GInstanceInitFunc) dia_size_selector_init
};
- dss_type = g_type_register_static (gtk_hbox_get_type (),
+ dss_type = g_type_register_static (GTK_TYPE_BOX,
"DiaSizeSelector",
&dss_info, 0);
}
@@ -289,7 +292,7 @@ dia_alignment_selector_set_alignment (GtkWidget *as,
/************* DiaFileSelector: ***************/
struct _DiaFileSelector
{
- GtkHBox hbox;
+ GtkBox hbox;
GtkEntry *entry;
GtkButton *browse;
GtkWidget *dialog;
@@ -299,7 +302,7 @@ struct _DiaFileSelector
struct _DiaFileSelectorClass
{
- GtkHBoxClass parent_class;
+ GtkBoxClass parent_class;
};
enum {
@@ -427,6 +430,9 @@ dia_file_selector_browse_pressed(GtkWidget *widget, gpointer data)
static void
dia_file_selector_init (DiaFileSelector *fs)
{
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (fs),
+ GTK_ORIENTATION_HORIZONTAL);
+
/* Here's where we set up the real thing */
fs->dialog = NULL;
fs->sys_filename = NULL;
@@ -464,7 +470,7 @@ dia_file_selector_get_type (void)
(GInstanceInitFunc)dia_file_selector_init,
};
- dfs_type = g_type_register_static (gtk_hbox_get_type (),
+ dfs_type = g_type_register_static (GTK_TYPE_BOX,
"DiaFileSelector",
&dfs_info, 0);
}
diff --git a/objects/AADL/edit_port_declaration.c b/objects/AADL/edit_port_declaration.c
index a0c1873c..93c89b6b 100755
--- a/objects/AADL/edit_port_declaration.c
+++ b/objects/AADL/edit_port_declaration.c
@@ -142,7 +142,7 @@ ObjectChange *edit_port_declaration_callback (DiaObject *obj,
gtk_window_set_title(GTK_WINDOW(window) , "Port Declaration");
gtk_container_set_border_width(GTK_CONTAINER(window),5);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_widget_show (vbox);
diff --git a/objects/UML/class_attributes_dialog.c b/objects/UML/class_attributes_dialog.c
index 38cc478c..35a7bde8 100644
--- a/objects/UML/class_attributes_dialog.c
+++ b/objects/UML/class_attributes_dialog.c
@@ -451,10 +451,10 @@ _attributes_create_page(GtkNotebook *notebook, UMLClass *umlclass)
/* Attributes page: */
page_label = gtk_label_new_with_mnemonic (_("_Attributes"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
@@ -474,7 +474,7 @@ _attributes_create_page(GtkNotebook *notebook, UMLClass *umlclass)
g_signal_connect (G_OBJECT (list), "selection_changed",
G_CALLBACK(attributes_list_selection_changed_callback), umlclass);
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
button = gtk_button_new_from_stock (GTK_STOCK_NEW);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -502,7 +502,7 @@ _attributes_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
frame = gtk_frame_new(_("Attribute data"));
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 10);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
gtk_widget_show(frame);
@@ -585,7 +585,7 @@ _attributes_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_table_attach (GTK_TABLE (table), align, 1,2,4,5, GTK_FILL,0, 0,3);
}
- hbox2 = gtk_hbox_new(FALSE, 5);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Class scope"));
prop_dialog->attr_class_scope = GTK_TOGGLE_BUTTON(checkbox);
gtk_box_pack_start (GTK_BOX (hbox2), checkbox, TRUE, TRUE, 0);
diff --git a/objects/UML/class_dialog.c b/objects/UML/class_dialog.c
index bc1d1c49..2e3b0b2d 100644
--- a/objects/UML/class_dialog.c
+++ b/objects/UML/class_dialog.c
@@ -319,7 +319,7 @@ class_create_page(GtkNotebook *notebook, UMLClass *umlclass)
/* Class page: */
page_label = gtk_label_new_with_mnemonic (_("_Class"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
table = gtk_table_new (3, 2, FALSE);
@@ -355,13 +355,13 @@ class_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_table_attach (GTK_TABLE (table), label, 0,1,2,3, GTK_FILL,0, 0,0);
gtk_container_add (GTK_CONTAINER (scrolledwindow), entry);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Abstract"));
prop_dialog->abstract_class = GTK_TOGGLE_BUTTON( checkbox );
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Attributes visible"));
prop_dialog->attr_vis = GTK_TOGGLE_BUTTON( checkbox );
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
@@ -370,7 +370,7 @@ class_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Operations visible"));
prop_dialog->op_vis = GTK_TOGGLE_BUTTON( checkbox );
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
@@ -379,8 +379,9 @@ class_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(TRUE, 5);
- hbox2 = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Wrap Operations"));
prop_dialog->op_wrap = GTK_TOGGLE_BUTTON( checkbox );
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
@@ -394,8 +395,9 @@ class_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET( hbox2), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(TRUE, 5);
- hbox2 = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Comments visible"));
prop_dialog->comments_vis = GTK_TOGGLE_BUTTON( checkbox );
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
@@ -409,7 +411,7 @@ class_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET( hbox2), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Show documentation tag"));
prop_dialog->comment_tagging = GTK_TOGGLE_BUTTON( checkbox );
gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
@@ -441,7 +443,7 @@ style_create_page(GtkNotebook *notebook, UMLClass *umlclass)
/** Fonts and Colors selection **/
page_label = gtk_label_new_with_mnemonic (_("_Style"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
table = gtk_table_new (5, 6, TRUE);
@@ -692,7 +694,7 @@ umlclass_get_properties(UMLClass *umlclass, gboolean is_default)
prop_dialog = g_new(UMLClassDialog, 1);
umlclass->properties_dialog = prop_dialog;
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
g_object_ref_sink(vbox);
prop_dialog->dialog = vbox;
diff --git a/objects/UML/class_operations_dialog.c b/objects/UML/class_operations_dialog.c
index f8cfebb5..bd10f70f 100644
--- a/objects/UML/class_operations_dialog.c
+++ b/objects/UML/class_operations_dialog.c
@@ -763,10 +763,10 @@ operations_data_create_hbox (UMLClass *umlclass)
prop_dialog = umlclass->properties_dialog;
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- vbox2 = gtk_vbox_new(FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
/* table containing operation 'name' up to 'query' and also the comment */
table = gtk_table_new (5, 3, FALSE);
@@ -880,9 +880,9 @@ operations_parameters_editor_create_vbox (UMLClass *umlclass)
prop_dialog = umlclass->properties_dialog;
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
/* Parameters list label */
- hbox2 = gtk_hbox_new(FALSE, 5);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
label = gtk_label_new(_("Parameters:"));
gtk_box_pack_start( GTK_BOX(hbox2), label, FALSE, TRUE, 0);
@@ -890,7 +890,8 @@ operations_parameters_editor_create_vbox (UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (vbox2), hbox2, TRUE, TRUE, 0);
/* Parameters list editor - with of list at least width of buttons*/
- hbox2 = gtk_hbox_new(TRUE, 5);
+ hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_box_set_homogeneous (GTK_BOX (hbox2), TRUE);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
@@ -911,7 +912,7 @@ operations_parameters_editor_create_vbox (UMLClass *umlclass)
G_CALLBACK(parameters_list_selection_changed_callback),
umlclass);
- vbox3 = gtk_vbox_new(FALSE, 5);
+ vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
button = gtk_button_new_from_stock (GTK_STOCK_NEW);
prop_dialog->param_new_button = button;
@@ -961,9 +962,9 @@ operations_parameters_data_create_vbox (UMLClass *umlclass)
prop_dialog = umlclass->properties_dialog;
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
frame = gtk_frame_new(_("Parameter data"));
- vbox3 = gtk_vbox_new(FALSE, 5);
+ vbox3 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox3), 5);
gtk_container_add (GTK_CONTAINER (frame), vbox3);
gtk_widget_show(frame);
@@ -1067,10 +1068,10 @@ _operations_create_page(GtkNotebook *notebook, UMLClass *umlclass)
/* Operations page: */
page_label = gtk_label_new_with_mnemonic (_("_Operations"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
@@ -1091,7 +1092,7 @@ _operations_create_page(GtkNotebook *notebook, UMLClass *umlclass)
G_CALLBACK(operations_list_selection_changed_callback),
umlclass);
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
button = gtk_button_new_from_stock (GTK_STOCK_NEW);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -1121,7 +1122,7 @@ _operations_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
frame = gtk_frame_new(_("Operation data"));
- vbox2 = gtk_vbox_new(FALSE, 0);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
hbox = operations_data_create_hbox (umlclass);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
@@ -1129,7 +1130,7 @@ _operations_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
/* parameter stuff below operation stuff */
- hbox = gtk_hbox_new (FALSE, 5);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
vbox3 = operations_parameters_editor_create_vbox (umlclass);
gtk_box_pack_start (GTK_BOX (hbox), vbox3, TRUE, TRUE, 5);
diff --git a/objects/UML/class_templates_dialog.c b/objects/UML/class_templates_dialog.c
index e2498015..027a4a5a 100644
--- a/objects/UML/class_templates_dialog.c
+++ b/objects/UML/class_templates_dialog.c
@@ -365,16 +365,16 @@ _templates_create_page(GtkNotebook *notebook, UMLClass *umlclass)
/* Templates page: */
page_label = gtk_label_new_with_mnemonic (_("_Templates"));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- hbox2 = gtk_hbox_new(FALSE, 5);
+ hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
checkbox = gtk_check_button_new_with_label(_("Template class"));
prop_dialog->templ_template = GTK_TOGGLE_BUTTON(checkbox);
gtk_box_pack_start (GTK_BOX (hbox2), checkbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, 5);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
@@ -394,7 +394,7 @@ _templates_create_page(GtkNotebook *notebook, UMLClass *umlclass)
g_signal_connect (G_OBJECT (list), "selection_changed",
G_CALLBACK(templates_list_selection_changed_callback), umlclass);
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
button = gtk_button_new_from_stock (GTK_STOCK_NEW);
g_signal_connect (G_OBJECT (button), "clicked",
@@ -422,7 +422,7 @@ _templates_create_page(GtkNotebook *notebook, UMLClass *umlclass)
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
frame = gtk_frame_new(_("Formal parameter data"));
- vbox2 = gtk_vbox_new(FALSE, 5);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 10);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
gtk_widget_show(frame);
diff --git a/plug-ins/xslt/xsltdialog.c b/plug-ins/xslt/xsltdialog.c
index 5b5ecfb4..418d5a77 100644
--- a/plug-ins/xslt/xsltdialog.c
+++ b/plug-ins/xslt/xsltdialog.c
@@ -108,7 +108,7 @@ xslt_dialog_create(void) {
box = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_set_border_width (GTK_CONTAINER (box), 10);
@@ -138,7 +138,7 @@ xslt_dialog_create(void) {
cur_f = froms;
- vbox = gtk_vbox_new(FALSE, 5);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_set_border_width (GTK_CONTAINER (box), 10);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
