diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-04-23 11:10:08 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-04-23 11:10:08 +0000 |
| commit | 987ce281e4dcd36f489b37b510ff4f309d67730e (patch) | |
| tree | 9f4578fc9b93dfe00f4487a6529b582184534d77 /ui | |
| parent | 618afe1a7733a566d1794bce7d6e5080b739b0de (diff) | |
| download | wireshark-987ce281e4dcd36f489b37b510ff4f309d67730e.tar.gz wireshark-987ce281e4dcd36f489b37b510ff4f309d67730e.tar.bz2 wireshark-987ce281e4dcd36f489b37b510ff4f309d67730e.zip | |
Use GtkFontChooser if GTK >= 3.2
svn path=/trunk/; revision=42205
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/prefs_dlg.c | 6 | ||||
| -rw-r--r-- | ui/gtk/prefs_gui.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 41205f3e93..479c3b2e39 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -538,10 +538,12 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page) /* We set the current font now, because setting it appears not to work when run before appending the frame to the notebook. */ - +#if GTK_CHECK_VERSION(3,2,0) + gtk_font_chooser_set_font(GTK_FONT_CHOOSER(gui_font_pg), prefs.gui_font_name); +#else gtk_font_selection_set_font_name( GTK_FONT_SELECTION(gui_font_pg), prefs.gui_font_name); - +#endif /* GTK_CHECK_VERSION(3,2,0) */ /* GUI Colors prefs */ g_strlcpy(label_str, "Colors", MAX_TREE_NODE_NAME_LEN); prefs_nb_page_add(prefs_nb, label_str, stream_prefs_show(), E_GUI_COLORS_PAGE_KEY); diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 8036507ee9..e24a694e3f 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -380,7 +380,11 @@ GtkWidget * gui_font_prefs_show(void) { /* Create the font selection widget. */ +#if GTK_CHECK_VERSION(3,2,0) + font_browse_w = gtk_font_chooser_widget_new(); +#else font_browse_w = (GtkWidget *) gtk_font_selection_new(); +#endif /* GTK_CHECK_VERSION(3,2,0) */ gtk_widget_show(font_browse_w); return font_browse_w; @@ -392,8 +396,14 @@ font_fetch(void) { gchar *font_name; + +#if GTK_CHECK_VERSION(3,2,0) + font_name = g_strdup(gtk_font_chooser_get_font( + GTK_FONT_CHOOSER(font_browse_w))); +#else font_name = g_strdup(gtk_font_selection_get_font_name( GTK_FONT_SELECTION(font_browse_w))); +#endif /* GTK_CHECK_VERSION(3,2,0) */ if (font_name == NULL) { /* No font was selected; let the user know, but don't tear down the font selection dialog, so they can |