diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-13 21:22:43 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-13 21:22:43 +0000 |
| commit | 5fdab345ed60a124a25aa0efecd36b4307b72681 (patch) | |
| tree | 9da8eae3a08679edbbb5994b6b2681a2c81b97f1 /src/ui/widget/notebook-page.cpp | |
| parent | Prevent crashing on windows systems due to locale issues (diff) | |
| parent | cppcheck (diff) | |
| download | inkscape-5fdab345ed60a124a25aa0efecd36b4307b72681.tar.gz inkscape-5fdab345ed60a124a25aa0efecd36b4307b72681.zip | |
merge from trunk (r12201)
(bzr r11668.1.57)
Diffstat (limited to 'src/ui/widget/notebook-page.cpp')
| -rw-r--r-- | src/ui/widget/notebook-page.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/ui/widget/notebook-page.cpp b/src/ui/widget/notebook-page.cpp index 92bcb6937..6653499b8 100644 --- a/src/ui/widget/notebook-page.cpp +++ b/src/ui/widget/notebook-page.cpp @@ -9,22 +9,35 @@ * Released under GNU GPL. Read the file 'COPYING' for more information */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include "notebook-page.h" +#if WITH_GTKMM_3_0 +# include <gtkmm/grid.h> +#else +# include <gtkmm/table.h> +#endif + namespace Inkscape { namespace UI { namespace Widget { NotebookPage::NotebookPage(int n_rows, int n_columns, bool expand, bool fill, guint padding) - :_table(n_rows, n_columns) +#if WITH_GTKMM_3_0 + :_table(Gtk::manage(new Gtk::Grid())) +#else + :_table(Gtk::manage(new Gtk::Table(n_rows, n_columns))) +#endif { set_border_width(2); - _table.set_spacings(2); - pack_start(_table, expand, fill, padding); + +#if WITH_GTKMM_3_0 + _table->set_row_spacing(2); + _table->set_column_spacing(2); +#else + _table->set_spacings(2); +#endif + + pack_start(*_table, expand, fill, padding); } } // namespace Widget |