summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-04-10 20:21:08 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-04-10 20:21:08 +0000
commite30be1920be10cc0d9a79c244c890785c72f37bb (patch)
tree087727d0cd8ae9392797faeabbc2dd08a636648b /src/widgets/paint-selector.cpp
parent2geom: sbasis multiplication never returns sbasis of at least order a+b (diff)
downloadinkscape-e30be1920be10cc0d9a79c244c890785c72f37bb.tar.gz
inkscape-e30be1920be10cc0d9a79c244c890785c72f37bb.zip
Replace deprecated gtk_vbox_new and gtk_widget_size_request
(bzr r11213)
Diffstat (limited to 'src/widgets/paint-selector.cpp')
-rw-r--r--src/widgets/paint-selector.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 13b112dc6..d97f79cd4 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -288,7 +288,12 @@ sp_paint_selector_init(SPPaintSelector *psel)
gtk_box_pack_start(GTK_BOX(lbbox), psel->label, false, false, 4);
gtk_box_pack_start(GTK_BOX(psel), lbbox, false, false, 4);
+#if GTK_CHECK_VERSION(3,0,0)
+ psel->frame = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+ gtk_box_new(GTK_BOX(psel->frame), FALSE);
+#else
psel->frame = gtk_vbox_new(FALSE, 4);
+#endif
gtk_widget_show(psel->frame);
//gtk_container_set_border_width(GTK_CONTAINER(psel->frame), 0);
gtk_box_pack_start(GTK_BOX(psel), psel->frame, TRUE, TRUE, 0);
@@ -672,7 +677,12 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
sp_paint_selector_clear_frame(psel);
/* Create new color selector */
/* 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);
+#else
GtkWidget *vb = gtk_vbox_new(FALSE, 4);
+#endif
gtk_widget_show(vb);
/* Color selector */
@@ -1013,7 +1023,12 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
sp_paint_selector_clear_frame(psel);
/* Create vbox */
+#if GTK_CHECK_VERSION(3,0,0)
+ tbl = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
+ gtk_box_new(GTK_BOX(tbl), FALSE);
+#else
tbl = gtk_vbox_new(FALSE, 4);
+#endif
gtk_widget_show(tbl);
{