diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-30 23:08:33 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-30 23:08:33 +0000 |
| commit | 7a38f66b0aefb8da58dd26ec51e4de53e8d1cf95 (patch) | |
| tree | efe8370f02cbc6114d100c63ebbc24ad30893bcb /src/widgets | |
| parent | gtkmm-3.0 changes for Gtk::Adjustment (diff) | |
| download | inkscape-7a38f66b0aefb8da58dd26ec51e4de53e8d1cf95.tar.gz inkscape-7a38f66b0aefb8da58dd26ec51e4de53e8d1cf95.zip | |
Fix typos in Gtk3 fixes, and fix separator API usage
(bzr r11309)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 17 | ||||
| -rw-r--r-- | src/widgets/font-selector.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/paint-selector.cpp | 6 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 71f7b8c17..6aecc4ada 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -525,7 +525,14 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->selected_style = new Inkscape::UI::Widget::SelectedStyle(true); GtkHBox *ss_ = dtw->selected_style->gobj(); gtk_box_pack_start (GTK_BOX (dtw->statusbar), GTK_WIDGET(ss_), FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (dtw->statusbar), gtk_vseparator_new(), FALSE, FALSE, 0); + + gtk_box_pack_start(GTK_BOX(dtw->statusbar), +#if GTK_CHECK_VERSION(3,0,0) + gtk_separator_new(GTK_ORIENTATION_VERTICAL), +#else + gtk_vseparator_new(), +#endif + FALSE, FALSE, 0); // connect scrollbar signals g_signal_connect (G_OBJECT (dtw->hadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); @@ -554,7 +561,13 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->coord_status = gtk_table_new (5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(dtw->coord_status), 0); gtk_table_set_col_spacings(GTK_TABLE(dtw->coord_status), 2); - gtk_table_attach(GTK_TABLE(dtw->coord_status), gtk_vseparator_new(), 0,1, 0,2, GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach(GTK_TABLE(dtw->coord_status), +#if GTK_CHECK_VERSION(3,0,0) + gtk_separator_new(GTK_ORIENTATION_VERTICAL), +#else + gtk_vseparator_new(), +#endif + 0,1, 0,2, GTK_FILL, GTK_FILL, 0, 0); eventbox = gtk_event_box_new (); gtk_container_add (GTK_CONTAINER (eventbox), dtw->coord_status); gtk_widget_set_tooltip_text (eventbox, _("Cursor coordinates")); diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index ff361a6b8..affc6bed9 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -178,7 +178,7 @@ static void sp_font_selector_init(SPFontSelector *fsel) #if GTK_CHECK_VERSION(3,0,0) GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); - gtk_box_new(GTK_BOX(vb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(vb), FALSE); #else GtkWidget *vb = gtk_vbox_new(FALSE, 4); #endif diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 075308321..c1147f9b0 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -290,7 +290,7 @@ sp_paint_selector_init(SPPaintSelector *psel) #if GTK_CHECK_VERSION(3,0,0) psel->frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); - gtk_box_new(GTK_BOX(psel->frame), FALSE); + gtk_box_set_homogeneous(GTK_BOX(psel->frame), FALSE); #else psel->frame = gtk_vbox_new(FALSE, 4); #endif @@ -664,7 +664,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec /* Create vbox */ #if GTK_CHECK_VERSION(3,0,0) GtkWidget *vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); - gtk_box_new(GTK_BOX(vb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(vb), FALSE); #else GtkWidget *vb = gtk_vbox_new(FALSE, 4); #endif @@ -1003,7 +1003,7 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel /* Create vbox */ #if GTK_CHECK_VERSION(3,0,0) tbl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); - gtk_box_new(GTK_BOX(tbl), FALSE); + gtk_box_set_homogeneous(GTK_BOX(tbl), FALSE); #else tbl = gtk_vbox_new(FALSE, 4); #endif |