AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use gtk_separator_new() instead gtk_[v|h]separator_new()

Browse Source
This commit is contained in:
Javier Jardón 2010-10-30 01:32:34 +02:00
parent e31304fb7b
commit 8d008790be
19 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/gtk-demo/dialog.c
View File

@ -132,7 +132,8 @@ do_dialog (GtkWidget *do_widget)
G_CALLBACK (message_dialog_clicked), NULL);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
FALSE, FALSE, 0);
/* Interactive dialog*/
hbox = gtk_hbox_new (FALSE, 8);

2
demos/gtk-demo/ui_manager.c
View File

@ -209,7 +209,7 @@ do_ui_manager (GtkWidget *do_widget)
gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);

6
docs/tools/widgets.c
View File

@ -504,7 +504,7 @@ create_file_button (void)
gtk_box_pack_start (GTK_BOX (vbox),
vbox2, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_hseparator_new (),
gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
FALSE, FALSE, 0);
vbox2 = gtk_vbox_new (FALSE, 3);
@ -533,10 +533,10 @@ create_separator (void)
vbox = gtk_vbox_new (FALSE, 3);
hbox = gtk_hbox_new (TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_hseparator_new (),
gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_vseparator_new (),
gtk_separator_new (GTK_ORIENTATION_VERTICAL),
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox),

2
examples/calendar/calendar.c
View File

@ -322,7 +322,7 @@ static void create_calendar( void )
&calendar_data);
separator = gtk_vseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (hbox), separator, FALSE, TRUE, 0);
vbox2 = gtk_vbox_new (FALSE, DEF_PAD);

10
examples/packbox/packbox.c
View File

@ -141,7 +141,7 @@ int main( int argc,
/* Creates a separator, we'll learn more about these later,
* but they are quite simple. */
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
/* Pack the separator into the vbox. Remember each of these
* widgets is being packed into a vbox, so they'll be stacked
@ -166,7 +166,7 @@ int main( int argc,
gtk_widget_show (box2);
/* Another new separator. */
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
/* The last 3 arguments to gtk_box_pack_start are:
* expand, fill, padding. */
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
@ -193,7 +193,7 @@ int main( int argc,
gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
gtk_widget_show (box2);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
/* The last 3 arguments to gtk_box_pack_start are:
* expand, fill, padding. */
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
@ -214,7 +214,7 @@ int main( int argc,
gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
gtk_widget_show (box2);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
/* The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. */
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
gtk_widget_show (separator);
@ -239,7 +239,7 @@ int main( int argc,
gtk_widget_show (box2);
/* A separator for the bottom. */
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
/* This explicitly sets the separator to 400 pixels wide by 5 pixels
* high. This is so the hbox we created will also be 400 pixels wide,
* and the "end" label will be separated from the other labels in the

2
examples/progressbar/progressbar.c
View File

@ -136,7 +136,7 @@ int main( int argc,
/* Add a timer callback to update the value of the progress bar */
pdata->timer = gdk_threads_add_timeout (100, progress_timeout, pdata);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
gtk_widget_show (separator);

2
examples/radiobuttons/radiobuttons.c
View File

@ -55,7 +55,7 @@ int main( int argc,
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
gtk_widget_show (button);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);

2
examples/rangewidgets/rangewidgets.c
View File

@ -258,7 +258,7 @@ static void create_range_controls( void )
gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
gtk_widget_show (box2);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);

2
gtk/gtkcolorsel.c
View File

@ -438,7 +438,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
_("Amount of green light in the color."));
make_label_spinbutton (colorsel, &priv->blue_spinbutton, _("_Blue:"), table, 6, 2, COLORSEL_BLUE,
_("Amount of blue light in the color."));
gtk_table_attach_defaults (GTK_TABLE (table), gtk_hseparator_new (), 0, 8, 3, 4);
gtk_table_attach_defaults (GTK_TABLE (table), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), 0, 8, 3, 4);
priv->opacity_label = gtk_label_new_with_mnemonic (_("Op_acity:"));
gtk_misc_set_alignment (GTK_MISC (priv->opacity_label), 0.0, 0.5);

2
gtk/gtkcombobox.c
View File

@ -3033,7 +3033,7 @@ gtk_combo_box_menu_setup (GtkComboBox *combo_box,
priv->box = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (priv->button), priv->box);
priv->separator = gtk_vseparator_new ();
priv->separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (priv->box), priv->separator);
priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);

2
gtk/gtkfilechooserbutton.c
View File

@ -455,7 +455,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button)
gtk_container_add (GTK_CONTAINER (box), priv->label);
gtk_widget_show (priv->label);
sep = gtk_vseparator_new ();
sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_start (GTK_BOX (box), sep, FALSE, FALSE, 0);
gtk_widget_show (sep);

2
gtk/gtkfontbutton.c
View File

@ -789,7 +789,7 @@ gtk_font_button_create_inside (GtkFontButton *font_button)
if (font_button->priv->show_size)
{
gtk_box_pack_start (GTK_BOX (widget), gtk_vseparator_new (), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (widget), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
font_button->priv->size_label = gtk_label_new ("14");
gtk_box_pack_start (GTK_BOX (widget), font_button->priv->size_label, FALSE, FALSE, 5);
}

2
modules/other/gail/tests/testtable.c
View File

@ -808,7 +808,7 @@ void test_choice_gui(AtkObject **obj)
tc->tb_others = gtk_toggle_button_new_with_label("others");
gtk_box_pack_start (GTK_BOX (vbox), tc->tb_others, TRUE, TRUE, 0);
hseparator = gtk_hseparator_new();
hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), hseparator, TRUE, TRUE, 0);
button = gtk_button_new_with_mnemonic("_Run Test");

15
tests/testcalendar.c
View File

@ -651,11 +651,16 @@ create_calendar(void)
vbox = gtk_vbox_new (FALSE, DEF_PAD_SMALL);
gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hpaned,
TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), frame,
FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), bbox,
FALSE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);

40
tests/testgtk.c
View File

@ -762,7 +762,7 @@ create_buttons (GtkWidget *widget)
gtk_table_attach (GTK_TABLE (table), button[8], 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -830,7 +830,7 @@ create_toggle_buttons (GtkWidget *widget)
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -959,7 +959,7 @@ create_check_buttons (GtkWidget *widget)
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
table = create_widget_grid (GTK_TYPE_CHECK_BUTTON);
@ -1031,7 +1031,7 @@ create_radio_buttons (GtkWidget *widget)
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -1055,7 +1055,7 @@ create_radio_buttons (GtkWidget *widget)
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
table = create_widget_grid (GTK_TYPE_RADIO_BUTTON);
@ -1622,7 +1622,7 @@ create_statusbar (GtkWidget *widget)
"signal_after::clicked", statusbar_push_long, statusbar,
NULL);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -1696,7 +1696,7 @@ create_handle_box (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (vbox), label);
gtk_widget_show (label);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_container_add (GTK_CONTAINER (vbox), separator);
gtk_widget_show (separator);
@ -1704,7 +1704,7 @@ create_handle_box (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (vbox), hbox);
gtk_widget_show (hbox);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_container_add (GTK_CONTAINER (vbox), separator);
gtk_widget_show (separator);
@ -2355,7 +2355,7 @@ create_reparent (GtkWidget *widget)
G_CALLBACK (reparent_label),
event_box);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -2730,7 +2730,7 @@ create_pixbuf (GtkWidget *widget)
gtk_widget_set_sensitive (button, FALSE);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -2829,7 +2829,7 @@ create_tooltips (GtkWidget *widget)
NULL);
gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, 10, GTK_PACK_START);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -3303,7 +3303,7 @@ create_menus (GtkWidget *widget)
gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
gtk_widget_show (optionmenu);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);
@ -3631,7 +3631,7 @@ create_modal_window (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (frame1), box2);
gtk_box_pack_start (GTK_BOX (box2), btnColor, FALSE, FALSE, 4);
gtk_box_pack_start (GTK_BOX (box2), btnFile, FALSE, FALSE, 4);
gtk_box_pack_start (GTK_BOX (box1), gtk_hseparator_new (), FALSE, FALSE, 4);
gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 4);
gtk_box_pack_start (GTK_BOX (box1), btnClose, FALSE, FALSE, 4);
/* connect signals */
@ -4035,7 +4035,7 @@ create_entry (GtkWidget *widget)
g_signal_connect (progress_check, "toggled",
G_CALLBACK (entry_toggle_pulse), entry);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -4203,7 +4203,7 @@ create_event_box (GtkWidget *widget)
G_CALLBACK (event_box_toggle_above_child), event_box);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (above_child_check), FALSE);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);
@ -5881,7 +5881,7 @@ create_range_controls (GtkWidget *widget)
gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);
@ -6301,7 +6301,7 @@ create_notebook (GtkWidget *widget)
create_pages (GTK_NOTEBOOK (sample_notebook), 1, 5);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 10);
box2 = gtk_hbox_new (FALSE, 5);
@ -6352,7 +6352,7 @@ create_notebook (GtkWidget *widget)
G_CALLBACK (rotate_notebook), sample_notebook);
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
button = gtk_button_new_with_label ("close");
@ -7230,7 +7230,7 @@ create_wmhints (GtkWidget *widget)
gtk_widget_show (label);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);
@ -10114,7 +10114,7 @@ create_main_window (void)
gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
}
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10);

2
tests/testmenubars.c
View File

@ -151,7 +151,7 @@ main (int argc, char **argv)
gtk_widget_show_all (box1);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);

2
tests/testorientable.c
View File

@ -89,7 +89,7 @@ main (int argc, char **argv)
TRUE, TRUE, 0);
/* GtkSeparator */
box = gtk_hseparator_new ();
box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
orientables = g_list_prepend (orientables, box);
gtk_table_attach_defaults (GTK_TABLE (table), box, 2, 3, 1, 2);

2
tests/testtext.c
View File

@ -269,7 +269,7 @@ msgbox_run (GtkWindow *parent,
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
separator = gtk_hseparator_new ();
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);

3
tests/testtreecolumns.c
View File

@ -943,7 +943,8 @@ main (int argc, char *argv[])
GDK_ACTION_MOVE);
gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);