diff options
| author | Stefano Karapetsas <[email protected]> | 2014-05-11 18:38:36 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-05-11 18:38:36 +0200 |
| commit | 36ee6c121996ede96f838964b51e950d3c957491 (patch) | |
| tree | 9f439ec230d2ec666d341bccc2ef053a78a87d54 | |
| parent | d80a75c3b9b4d453067386c6a8f3cc7506c0a401 (diff) | |
| download | mate-desktop-36ee6c121996ede96f838964b51e950d3c957491.tar.bz2 mate-desktop-36ee6c121996ede96f838964b51e950d3c957491.tar.xz | |
MateColorSelectionDialog: Allow to use header bar with GTK 3.12
| -rw-r--r-- | libmate-desktop/mate-colorseldialog.c | 18 | ||||
| -rw-r--r-- | libmate-desktop/mate-colorseldialog.h | 3 | ||||
| -rw-r--r-- | tools/mate-color-select.c | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/libmate-desktop/mate-colorseldialog.c b/libmate-desktop/mate-colorseldialog.c index ba72820..3f325c8 100644 --- a/libmate-desktop/mate-colorseldialog.c +++ b/libmate-desktop/mate-colorseldialog.c @@ -185,6 +185,24 @@ mate_color_selection_dialog_new (const gchar *title) return GTK_WIDGET (colorseldiag); } +// since 1.9.1 +#if GTK_CHECK_VERSION (3, 12, 0) +GtkWidget* +mate_color_selection_dialog_new_with_header_bar (const gchar *title) +{ + MateColorSelectionDialog *colorseldiag; + + colorseldiag = g_object_new (MATE_TYPE_COLOR_SELECTION_DIALOG, "use-header-bar", TRUE, NULL); + + if (title) + gtk_window_set_title (GTK_WINDOW (colorseldiag), title); + + gtk_window_set_resizable (GTK_WINDOW (colorseldiag), FALSE); + + return GTK_WIDGET (colorseldiag); +} +#endif + /** * mate_color_selection_dialog_get_color_selection: * @colorsel: a #MateColorSelectionDialog diff --git a/libmate-desktop/mate-colorseldialog.h b/libmate-desktop/mate-colorseldialog.h index 71a7873..0848c90 100644 --- a/libmate-desktop/mate-colorseldialog.h +++ b/libmate-desktop/mate-colorseldialog.h @@ -68,6 +68,9 @@ struct _MateColorSelectionDialogClass /* ColorSelectionDialog */ GType mate_color_selection_dialog_get_type (void) G_GNUC_CONST; GtkWidget* mate_color_selection_dialog_new (const gchar *title); +#if GTK_CHECK_VERSION (3, 12, 0) +GtkWidget* mate_color_selection_dialog_new_with_header_bar (const gchar *title); +#endif GtkWidget* mate_color_selection_dialog_get_color_selection (MateColorSelectionDialog *colorsel); diff --git a/tools/mate-color-select.c b/tools/mate-color-select.c index b2da648..5ef4785 100644 --- a/tools/mate-color-select.c +++ b/tools/mate-color-select.c @@ -42,7 +42,12 @@ main (int argc, char **argv) /* initialize GTK+ */ gtk_init (&argc, &argv); +#if GTK_CHECK_VERSION (3, 12, 0) + color_dialog = mate_color_selection_dialog_new_with_header_bar (_("MATE Color Selection")); + gtk_header_bar_set_show_close_button (gtk_dialog_get_header_bar (GTK_DIALOG (color_dialog)), TRUE); +#else color_dialog = mate_color_selection_dialog_new (_("MATE Color Selection")); +#endif /* quit signal */ g_signal_connect (color_dialog, "destroy", gtk_main_quit, NULL); |