diff options
| author | Wolfgang Ulbrich <[email protected]> | 2015-11-13 18:23:44 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2015-12-02 12:16:03 +0100 |
| commit | 2da5a2bddf41e0dfa99781fa4c8128e4854b2076 (patch) | |
| tree | 3bde6626edb9246f903d8eb2a1dfec07ec6eb918 /src/ui/tabpopup.c | |
| parent | 5f322a120154fda341bbdcd379f9051c742e5ab9 (diff) | |
| download | marco-2da5a2bddf41e0dfa99781fa4c8128e4854b2076.tar.bz2 marco-2da5a2bddf41e0dfa99781fa4c8128e4854b2076.tar.xz | |
Gtk+-3.14 tabpopup.c: don't use deprecated GtkAlignment
taken from:
https://git.gnome.org/browse/metacity/commit/?id=5aeb6e9
Diffstat (limited to 'src/ui/tabpopup.c')
| -rw-r--r-- | src/ui/tabpopup.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c index 459a63b2..a1c8e229 100644 --- a/src/ui/tabpopup.c +++ b/src/ui/tabpopup.c @@ -258,7 +258,9 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, GtkWidget *table; #endif GtkWidget *vbox; +#if !GTK_CHECK_VERSION (3, 14, 0) GtkWidget *align; +#endif GList *tmp; GtkWidget *frame; int max_label_width; /* the actual max width of the labels we create */ @@ -335,13 +337,19 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, gtk_container_add (GTK_CONTAINER (frame), vbox); +#if GTK_CHECK_VERSION (3, 14, 0) + gtk_box_pack_start (GTK_BOX (vbox), grid, TRUE, TRUE, 0); +#else align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0); +#endif #if GTK_CHECK_VERSION (3, 0, 0) +#if !GTK_CHECK_VERSION (3, 14, 0) gtk_container_add (GTK_CONTAINER (align), grid); +#endif #else gtk_container_add (GTK_CONTAINER (align), table); @@ -382,7 +390,11 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, if (te->blank) { /* just stick a widget here to avoid special cases */ +#if GTK_CHECK_VERSION (3, 14, 0) + image = gtk_label_new (""); +#else image = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); +#endif } else if (outline) { |