X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29f571de5c23f95213ed44e7953ef8601301b9d7..9ed3454e3d06f99510cd203419c40c46a0370c08:/src/generic/fontpickerg.cpp diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp index 5696313079..ffcbb91de3 100644 --- a/src/generic/fontpickerg.cpp +++ b/src/generic/fontpickerg.cpp @@ -47,8 +47,8 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString &name) { wxString label = (style & wxFNTP_FONTDESC_AS_LABEL) ? - wxEmptyString : // label will be updated by UpdateFont - wxT("Choose font"); + wxString() : // label will be updated by UpdateFont + _("Choose font"); // create this button if (!wxButton::Create( parent, id, label, pos, @@ -79,7 +79,7 @@ void wxGenericFontButton::InitFontData() void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) { - // update the wxFontData to be shown in the the dialog + // update the wxFontData to be shown in the dialog m_data.SetInitialFont(m_selectedFont); // create the font dialog and display it @@ -97,7 +97,7 @@ void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev)) void wxGenericFontButton::UpdateFont() { - if ( !m_selectedFont.Ok() ) + if ( !m_selectedFont.IsOk() ) return; SetForegroundColour(m_data.GetColour());