X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..cf31a1d7b60feddf23cc30259c6d909d4736ca56:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index b507f3e193..b799105717 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.cpp +// Name: gtk/fontdlg.cpp // Purpose: wxFontDialog // Author: Robert Roebling // Id: $Id$ @@ -11,13 +11,18 @@ #pragma implementation "fontdlg.h" #endif +#include "wx/defs.h" + +#if wxUSE_FONTDLG + +#include "wx/fontutil.h" #include "wx/fontdlg.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/debug.h" #include "wx/msgdlg.h" -#include "gtk/gtk.h" +#include //----------------------------------------------------------------------------- // idle system @@ -64,7 +69,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; } @@ -84,7 +90,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial } else { - wxFAIL_MSG(_T("no registry in X font spec?")); + wxFAIL_MSG( wxT("no registry in X font spec?") ); } // restore the dash we changed to NUL above @@ -92,7 +98,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial } else { - wxFAIL_MSG(_T("no encoding in X font spec?")); + wxFAIL_MSG( wxT("no encoding in X font spec?") ); } // transfer the X registry/encoding to wxFontData - they are used by @@ -101,13 +107,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 ); @@ -150,9 +155,7 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata ) wxFAIL_MSG( wxT("wxXX creation failed") ); return; } -#ifndef __WXGTK12__ - wxFAIL_MSG( wxT("TODO") ); -#else // GTK+ 1.2 + wxString m_message( _("Choose font") ); m_widget = gtk_font_selection_dialog_new( m_message.mbc_str() ); @@ -176,10 +179,31 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata ) gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); -#endif // GTK+ version + + 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() { } +#endif // wxUSE_FONTDLG +