Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence deprecation warnings about gtk_font_selection_dialog_*

Browse Source 
We use GtkFontChooser when available
This commit is contained in:
Paul Cornett
2016-02-08 10:44:50 -08:00
parent 94163e48c0
commit 08c176650c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/fontdlg.cpp
View File

@@ -41,9 +41,11 @@ static void response(GtkDialog* dialog, int response_id, wxFontDialog* win)
else else
#endif #endif
{ {
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(dialog); GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(dialog);
wxGtkString name(gtk_font_selection_dialog_get_font_name(sel)); wxGtkString name(gtk_font_selection_dialog_get_font_name(sel));
win->GetFontData().SetChosenFont(wxFont(wxString::FromUTF8(name))); win->GetFontData().SetChosenFont(wxFont(wxString::FromUTF8(name)));
wxGCC_WARNING_RESTORE()
} }
} }
@@ -86,9 +88,11 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
else else
#endif #endif
{ {
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
m_widget = gtk_font_selection_dialog_new(wxGTK_CONV(message)); m_widget = gtk_font_selection_dialog_new(wxGTK_CONV(message));
if (gtk_parent) if (gtk_parent)
gtk_window_set_transient_for(GTK_WINDOW(m_widget), gtk_parent); gtk_window_set_transient_for(GTK_WINDOW(m_widget), gtk_parent);
wxGCC_WARNING_RESTORE()
} }
g_object_ref(m_widget); g_object_ref(m_widget);
@@ -107,9 +111,11 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
else else
#endif #endif
{ {
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
const wxString& fontname = info->ToString(); const wxString& fontname = info->ToString();
GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(m_widget); GtkFontSelectionDialog* sel = GTK_FONT_SELECTION_DIALOG(m_widget);
gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname)); gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname));
wxGCC_WARNING_RESTORE()
} }
} }
else else