X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa056ab78be920eacac56e51864fe7a45d1a31a..3ebcfb769f52c756018de75dacf3218ff60a8768:/src/gtk/fontdlg.cpp?ds=inline diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 1298601a79..4b26ff00af 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -11,17 +11,13 @@ #pragma implementation "fontdlg.h" #endif +#include "wx/fontutil.h" #include "wx/fontdlg.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/debug.h" #include "wx/msgdlg.h" -#ifdef __VMS__ -#define gtk_font_selection_dialog_get_type gtk_font_selection_dialog_get_t -#define gtk_font_selection_dialog_get_font gtk_font_selection_dialog_get_f -#define gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_getnf -#endif #include //----------------------------------------------------------------------------- @@ -69,7 +65,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial if (!gfont) { - wxMessageBox(_("Please choose a valid font."), _("Error"), wxOK); + wxMessageBox(_("Please choose a valid font."), _("Error"), + wxOK | wxICON_ERROR); return; } @@ -106,13 +103,12 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial // we ignore the facename here - should be enough to choose an arbitrary // one if the registry/encoding are specified - // dialog->m_fontData.EncodingInfo().facename = xfamily; fontdata.EncodingInfo().xregistry = xregistry; fontdata.EncodingInfo().xencoding = xencoding; // pass fontdata to wxFont ctor so that it can get the encoding from there // if it is already known (otherwise it will try to deduce it itself) - dialog->m_fontData.SetChosenFont( wxFont(fontname, fontdata) ); + dialog->m_fontData.SetChosenFont(wxFont(fontname, fontdata.GetEncoding())); g_free( fontname ); @@ -179,6 +175,26 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata ) gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); + + wxFont font = m_fontData.GetInitialFont(); + if( font.Ok() ) + { + wxNativeFontInfo *info = font.GetNativeFontInfo(); + + if ( info ) + { + const wxString& fontname = info->xFontName; + if ( !fontname ) + font.GetInternalFont(); + gtk_font_selection_dialog_set_font_name(sel, + wxConvCurrent->cWX2MB(fontname)); + } + else + { + // this is not supposed to happen! + wxFAIL_MSG(_T("font is ok but no native font info?")); + } + } } wxFontDialog::~wxFontDialog()