diff options
| author | Jabiertxof <jtx@jtx> | 2016-12-28 08:45:05 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2016-12-28 08:45:05 +0000 |
| commit | 0b5fe85427b24c57020b852d453af5f79f5220da (patch) | |
| tree | 0b566defc5e9c0ff3efe3b1c272e2597b8b69d91 /src/display | |
| parent | First attemp working (diff) | |
| parent | Merge all upstream changes to GimpRuler (diff) | |
| download | inkscape-0b5fe85427b24c57020b852d453af5f79f5220da.tar.gz inkscape-0b5fe85427b24c57020b852d453af5f79f5220da.zip | |
add missing files
(bzr r15356.1.2)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 5 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 421a39fbd..94ee4ccfd 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -107,7 +107,12 @@ attach_all(Gtk::Grid &table, Gtk::Widget const *const arr[], unsigned size, int table.attach(const_cast<Gtk::Widget&>(*arr[i+1]), 1, r, 2, 1); } else if (arr[i]) { Gtk::Label& label = reinterpret_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i])); +#if GTK_CHECK_VERSION(3,16,0) + label.set_xalign(0.0); + label.set_yalign(0.5); +#else label.set_alignment (0.0); +#endif label.set_hexpand(); label.set_valign(Gtk::ALIGN_CENTER); table.attach(label, 0, r, 3, 1); diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 81d194b35..cf7d04555 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -413,7 +413,12 @@ static inline void attach_all(Gtk::Grid &table, Gtk::Widget const *const arr[], table.attach(const_cast<Gtk::Widget&>(*arr[i+1]), 1, r, 2, 1); } else if (arr[i]) { Gtk::Label& label = reinterpret_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i])); +#if GTK_CHECK_VERSION(3,16,0) + label.set_xalign(0.0); + label.set_yalign(0.5); +#else label.set_alignment (0.0); +#endif label.set_hexpand(); label.set_valign(Gtk::ALIGN_CENTER); table.attach(label, 0, r, 3, 1); |