X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/409d5a58605cfb202774b59c3af078d3be89d7d5..814028444d682b23af3809227cd485f4bebc1286:/samples/font/font.cpp?ds=sidebyside diff --git a/samples/font/font.cpp b/samples/font/font.cpp index aad214f94c..4c78adc24d 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -17,7 +17,7 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all Show(TRUE); - SetTopWindow(frame); + // Show it + frame->Show(true); // success: wxApp::OnRun() will be called which will enter the main message - // loop and the application will run. If we returned FALSE here, the + // loop and the application will run. If we returned 'false' here, the // application would exit immediately. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -211,59 +300,102 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size), m_textctrl(NULL) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), m_textctrl(NULL) { - m_fontSize = 12; + m_fontSize = wxNORMAL_FONT->GetPointSize(); + + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(Font_ViewMsg, "&View...\tCtrl-V", - "View an email message file"); + menuFile->Append(Font_TestTextValue, wxT("&Test text value"), + wxT("Verify that getting and setting text value doesn't change it")); + menuFile->Append(Font_ViewMsg, wxT("&View...\tCtrl-V"), + wxT("View an email message file")); menuFile->AppendSeparator(); - menuFile->Append(Font_About, "&About...\tCtrl-A", "Show about dialog"); + menuFile->Append(Font_About, wxT("&About\tCtrl-A"), wxT("Show about dialog")); menuFile->AppendSeparator(); - menuFile->Append(Font_Quit, "E&xit\tAlt-X", "Quit this program"); + menuFile->Append(Font_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); wxMenu *menuFont = new wxMenu; - menuFont->Append(Font_IncSize, "&Increase font size by 2 points\tCtrl-I"); - menuFont->Append(Font_DecSize, "&Decrease font size by 2 points\tCtrl-D"); + menuFont->Append(Font_IncSize, wxT("&Increase font size by 2 points\tCtrl-I")); + menuFont->Append(Font_DecSize, wxT("&Decrease font size by 2 points\tCtrl-D")); + menuFont->AppendSeparator(); + menuFont->AppendCheckItem(Font_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state")); + menuFont->AppendCheckItem(Font_Light, wxT("&Light\tCtrl-L"), wxT("Toggle light state")); + menuFont->AppendSeparator(); + menuFont->AppendCheckItem(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state")); +#ifndef __WXMSW__ + // under wxMSW slant == italic so there's no reason to provide another menu item for the same thing + menuFont->AppendCheckItem(Font_Slant, wxT("&Slant\tCtrl-S"), wxT("Toggle slant state")); +#endif menuFont->AppendSeparator(); - menuFont->Append(Font_Bold, "&Bold\tCtrl-B", "Toggle bold state", TRUE); - menuFont->Append(Font_Italic, "&Oblique\tCtrl-O", "Toggle italic state", TRUE); - menuFont->Append(Font_Underlined, "&Underlined\tCtrl-U", - "Toggle underlined state", TRUE); + menuFont->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"), + wxT("Toggle underlined state")); + menuFont->AppendCheckItem(Font_Strikethrough, wxT("&Strikethrough"), + wxT("Toggle strikethrough state")); + + menuFont->AppendSeparator(); + menuFont->Append(Font_SetNativeDesc, + wxT("Set native font &description\tShift-Ctrl-D")); + menuFont->Append(Font_SetNativeUserDesc, + wxT("Set &user font description\tShift-Ctrl-U")); menuFont->AppendSeparator(); - menuFont->Append(Font_CheckNativeToFromString, - "Check Native Font Info To/From String"); + menuFont->Append(Font_SetFamily, wxT("Set font family")); + menuFont->Append(Font_SetFaceName, wxT("Set font face name")); + menuFont->Append(Font_SetEncoding, wxT("Set font &encoding\tShift-Ctrl-E")); wxMenu *menuSelect = new wxMenu; - menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S", - "Select a standard font"); + menuSelect->Append(Font_Choose, wxT("&Select font...\tCtrl-S"), + wxT("Select a standard font")); + + wxMenu *menuStdFonts = new wxMenu; + menuStdFonts->Append(Font_wxNORMAL_FONT, wxT("wxNORMAL_FONT"), wxT("Normal font used by wxWidgets")); + menuStdFonts->Append(Font_wxSMALL_FONT, wxT("wxSMALL_FONT"), wxT("Small font used by wxWidgets")); + menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWidgets")); + menuStdFonts->Append(Font_wxSWISS_FONT, wxT("wxSWISS_FONT"), wxT("Swiss font used by wxWidgets")); + menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts); + + wxMenu *menuSettingFonts = new wxMenu; + menuSettingFonts->Append(Font_wxSYS_OEM_FIXED_FONT, wxT("wxSYS_OEM_FIXED_FONT"), + wxT("Original equipment manufacturer dependent fixed-pitch font.")); + menuSettingFonts->Append(Font_wxSYS_ANSI_FIXED_FONT, wxT("wxSYS_ANSI_FIXED_FONT"), + wxT("Windows fixed-pitch (monospaced) font. ")); + menuSettingFonts->Append(Font_wxSYS_ANSI_VAR_FONT, wxT("wxSYS_ANSI_VAR_FONT"), + wxT("Windows variable-pitch (proportional) font.")); + menuSettingFonts->Append(Font_wxSYS_SYSTEM_FONT, wxT("wxSYS_SYSTEM_FONT"), + wxT("System font.")); + menuSettingFonts->Append(Font_wxSYS_DEVICE_DEFAULT_FONT, wxT("wxSYS_DEVICE_DEFAULT_FONT"), + wxT("Device-dependent font.")); + menuSettingFonts->Append(Font_wxSYS_DEFAULT_GUI_FONT, wxT("wxSYS_DEFAULT_GUI_FONT"), + wxT("Default font for user interface objects such as menus and dialog boxes. ")); + menuSelect->Append(Font_SystemSettings, wxT("System fonts"), menuSettingFonts); + + menuSelect->AppendSeparator(); - menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F"); + menuSelect->Append(Font_EnumFamilies, wxT("Enumerate font &families\tCtrl-F")); menuSelect->Append(Font_EnumFixedFamilies, - "Enumerate fi&xed font families\tCtrl-X"); + wxT("Enumerate fi&xed font families\tCtrl-X")); menuSelect->Append(Font_EnumEncodings, - "Enumerate &encodings\tCtrl-E"); + wxT("Enumerate &encodings\tCtrl-E")); menuSelect->Append(Font_EnumFamiliesForEncoding, - "Find font for en&coding...\tCtrl-C", - "Find font families for given encoding"); + wxT("Find font for en&coding...\tCtrl-C"), + wxT("Find font families for given encoding")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, "&File"); - menuBar->Append(menuFont, "F&ont"); - menuBar->Append(menuSelect, "&Select"); + menuBar->Append(menuFile, wxT("&File")); + menuBar->Append(menuFont, wxT("F&ont")); + menuBar->Append(menuSelect, wxT("&Select")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); wxSplitterWindow *splitter = new wxSplitterWindow(this); - m_textctrl = new wxTextCtrl(splitter, -1, - "Paste text here to see how it looks\n" - "like in the given font", + m_textctrl = new wxTextCtrl(splitter, wxID_ANY, + wxT("Paste text here to see how it looks\nlike in the given font"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); @@ -271,9 +403,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) splitter->SplitHorizontally(m_textctrl, m_canvas, 100); +#if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(); - SetStatusText("Welcome to wxWindows font demo!"); + SetStatusText(wxT("Welcome to wxWidgets font demo!")); +#endif // wxUSE_STATUSBAR } // -------------------------------------------------------- @@ -292,10 +426,10 @@ protected: const wxString& encoding) { wxString text; - text.Printf(wxT("Encoding %d: %s (available in facename '%s')\n"), - ++m_n, encoding.c_str(), facename.c_str()); + text.Printf(wxT("Encoding %u: %s (available in facename '%s')\n"), + (unsigned int) ++m_n, encoding.c_str(), facename.c_str()); m_text += text; - return TRUE; + return true; } private: @@ -328,7 +462,7 @@ protected: virtual bool OnFacename(const wxString& facename) { m_facenames.Add(facename); - return TRUE; + return true; } private: @@ -353,6 +487,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, } wxString facename; + if ( silent ) { // choose the first @@ -366,8 +501,14 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, for ( n = 0; n < nFacenames; n++ ) facenames[n] = fontEnumerator.GetFacenames().Item(n); - n = wxGetSingleChoiceIndex("Choose a facename", "Font demo", - nFacenames, facenames, this); + n = wxGetSingleChoiceIndex + ( + wxT("Choose a facename"), + SAMPLE_TITLE, + nFacenames, + facenames, + this + ); if ( n != -1 ) facename = facenames[n]; @@ -375,81 +516,180 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, delete [] facenames; } - if ( !facename.IsEmpty() ) + if ( !facename.empty() ) { - wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL, FALSE, facename, encoding); + wxFont font(wxNORMAL_FONT->GetPointSize(), + wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, false, facename, encoding); DoChangeFont(font); } - return TRUE; + return true; } else if ( !silent ) { wxLogWarning(wxT("No such fonts found.")); } - return FALSE; + return false; } void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event)) { - static wxFontEncoding encodings[] = + wxFontEncoding enc = GetEncodingFromUser(); + if ( enc != wxFONTENCODING_SYSTEM ) { - wxFONTENCODING_ISO8859_1, - wxFONTENCODING_ISO8859_2, - wxFONTENCODING_ISO8859_5, - wxFONTENCODING_ISO8859_7, - wxFONTENCODING_ISO8859_15, - wxFONTENCODING_KOI8, - wxFONTENCODING_CP1250, - wxFONTENCODING_CP1251, - wxFONTENCODING_CP1252, - }; - - static const wxString encodingNames[] = + DoEnumerateFamilies(false, enc); + } +} + +void MyFrame::OnSetNativeDesc(wxCommandEvent& WXUNUSED(event)) +{ + wxString fontInfo = wxGetTextFromUser + ( + wxT("Enter native font string"), + wxT("Input font description"), + m_canvas->GetTextFont().GetNativeFontInfoDesc(), + this + ); + if ( fontInfo.empty() ) + return; // user clicked "Cancel" - do nothing + + wxFont font; + font.SetNativeFontInfo(fontInfo); + if ( !font.IsOk() ) + { + wxLogError(wxT("Font info string \"%s\" is invalid."), + fontInfo.c_str()); + return; + } + + DoChangeFont(font); +} + +void MyFrame::OnSetNativeUserDesc(wxCommandEvent& WXUNUSED(event)) +{ + wxString fontdesc = GetCanvas()->GetTextFont().GetNativeFontInfoUserDesc(); + wxString fontUserInfo = wxGetTextFromUser( + wxT("Here you can edit current font description"), + wxT("Input font description"), fontdesc, + this); + if (fontUserInfo.IsEmpty()) + return; // user clicked "Cancel" - do nothing + + wxFont font; + if (font.SetNativeFontInfoUserDesc(fontUserInfo)) { - "Western European (ISO-8859-1)", - "Central European (ISO-8859-2)", - "Cyrillic (ISO-8859-5)", - "Greek (ISO-8859-7)", - "Western European with Euro (ISO-8859-15)", - "KOI8-R", - "Windows Central European (CP 1250)", - "Windows Cyrillic (CP 1251)", - "Windows Western European (CP 1252)", - }; - - int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo", - WXSIZEOF(encodingNames), - encodingNames, - this); - - if ( n != -1 ) + wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid")); + DoChangeFont(font); + } + else { - DoEnumerateFamilies(FALSE, encodings[n]); + wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid")); + wxMessageBox(wxT("Error trying to create a font with such description...")); } } -void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnSetFamily(wxCommandEvent& WXUNUSED(event)) { - wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc(); + wxFontFamily f = GetFamilyFromUser(); - if ( fontInfo.IsEmpty() ) + wxFont font = m_canvas->GetTextFont(); + font.SetFamily(f); + DoChangeFont(font); +} + +void MyFrame::OnSetFaceName(wxCommandEvent& WXUNUSED(event)) +{ + wxString facename = GetCanvas()->GetTextFont().GetFaceName(); + wxString newFaceName = wxGetTextFromUser( + wxT("Here you can edit current font face name."), + wxT("Input font facename"), facename, + this); + if (newFaceName.IsEmpty()) + return; // user clicked "Cancel" - do nothing + + wxFont font(GetCanvas()->GetTextFont()); + if (font.SetFaceName(newFaceName)) // change facename only { - wxLogError(wxT("Native font info string is empty!")); + wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid")); + DoChangeFont(font); } else { - wxFont *font = wxFont::New(fontInfo); - if ( fontInfo != font->GetNativeFontInfoDesc() ) - wxLogError(wxT("wxNativeFontInfo ToString()/FromString() broken!")); - else - wxLogMessage(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str()); + wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid")); + wxMessageBox(wxT("There is no font with such face name..."), + wxT("Invalid face name"), wxOK|wxICON_ERROR, this); + } +} + +void MyFrame::OnSetEncoding(wxCommandEvent& WXUNUSED(event)) +{ + wxFontEncoding enc = GetEncodingFromUser(); + if ( enc == wxFONTENCODING_SYSTEM ) + return; + + wxFont font = m_canvas->GetTextFont(); + font.SetEncoding(enc); + DoChangeFont(font); +} + +wxFontEncoding MyFrame::GetEncodingFromUser() +{ + wxArrayString names; + wxArrayInt encodings; + + const size_t count = wxFontMapper::GetSupportedEncodingsCount(); + names.reserve(count); + encodings.reserve(count); + + for ( size_t n = 0; n < count; n++ ) + { + wxFontEncoding enc = wxFontMapper::GetEncoding(n); + encodings.push_back(enc); + names.push_back(wxFontMapper::GetEncodingName(enc)); + } + + int i = wxGetSingleChoiceIndex + ( + wxT("Choose the encoding"), + SAMPLE_TITLE, + names, + this + ); - delete font; - } + return i == -1 ? wxFONTENCODING_SYSTEM : (wxFontEncoding)encodings[i]; +} + +wxFontFamily MyFrame::GetFamilyFromUser() +{ + wxArrayString names; + wxArrayInt families; + + families.push_back(wxFONTFAMILY_DECORATIVE); + families.push_back(wxFONTFAMILY_ROMAN); + families.push_back(wxFONTFAMILY_SCRIPT); + families.push_back(wxFONTFAMILY_SWISS); + families.push_back(wxFONTFAMILY_MODERN); + families.push_back(wxFONTFAMILY_TELETYPE); + + names.push_back("DECORATIVE"); + names.push_back("ROMAN"); + names.push_back("SCRIPT"); + names.push_back("SWISS"); + names.push_back("MODERN"); + names.push_back("TELETYPE"); + + int i = wxGetSingleChoiceIndex + ( + wxT("Choose the family"), + SAMPLE_TITLE, + names, + this + ); + + return i == -1 ? wxFONTFAMILY_DEFAULT : (wxFontFamily)families[i]; } void MyFrame::DoResizeFont(int diff) @@ -468,6 +708,14 @@ void MyFrame::OnBold(wxCommandEvent& event) DoChangeFont(font); } +void MyFrame::OnLight(wxCommandEvent& event) +{ + wxFont font = m_canvas->GetTextFont(); + + font.SetWeight(event.IsChecked() ? wxFONTWEIGHT_LIGHT : wxFONTWEIGHT_NORMAL); + DoChangeFont(font); +} + void MyFrame::OnItalic(wxCommandEvent& event) { wxFont font = m_canvas->GetTextFont(); @@ -476,6 +724,14 @@ void MyFrame::OnItalic(wxCommandEvent& event) DoChangeFont(font); } +void MyFrame::OnSlant(wxCommandEvent& event) +{ + wxFont font = m_canvas->GetTextFont(); + + font.SetStyle(event.IsChecked() ? wxFONTSTYLE_SLANT : wxFONTSTYLE_NORMAL); + DoChangeFont(font); +} + void MyFrame::OnUnderline(wxCommandEvent& event) { wxFont font = m_canvas->GetTextFont(); @@ -484,16 +740,108 @@ void MyFrame::OnUnderline(wxCommandEvent& event) DoChangeFont(font); } +void MyFrame::OnStrikethrough(wxCommandEvent& event) +{ + wxFont font = m_canvas->GetTextFont(); + font.SetStrikethrough(event.IsChecked()); + DoChangeFont(font); +} + +void MyFrame::OnwxPointerFont(wxCommandEvent& event) +{ + wxFont font; + + switch ( event.GetId() ) + { + case Font_wxNORMAL_FONT: + font = *wxNORMAL_FONT; + break; + + case Font_wxSMALL_FONT: + font = *wxSMALL_FONT; + break; + + case Font_wxITALIC_FONT: + font = *wxITALIC_FONT; + break; + + case Font_wxSWISS_FONT: + font = *wxSWISS_FONT; + break; + + default: + wxFAIL_MSG( wxT("unknown standard font") ); + return; + } + + DoChangeFont(font); +} + +void MyFrame::OnwxSystemSettingsFont(wxCommandEvent& event) +{ + wxFont font; + + switch ( event.GetId() ) + { + case Font_wxSYS_OEM_FIXED_FONT: + font = wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT); + break; + + case Font_wxSYS_ANSI_FIXED_FONT: + font = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT); + break; + + case Font_wxSYS_ANSI_VAR_FONT: + font = wxSystemSettings::GetFont(wxSYS_ANSI_VAR_FONT); + break; + + case Font_wxSYS_SYSTEM_FONT: + font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT); + break; + + case Font_wxSYS_DEVICE_DEFAULT_FONT: + font = wxSystemSettings::GetFont(wxSYS_DEVICE_DEFAULT_FONT); + break; + + case Font_wxSYS_DEFAULT_GUI_FONT: + font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + break; + + default: + wxFAIL_MSG( wxT("unknown standard font") ); + return; + } + + DoChangeFont(font); +} + void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col) { m_canvas->SetTextFont(font); - if ( col.Ok() ) + if ( col.IsOk() ) m_canvas->SetColour(col); m_canvas->Refresh(); m_textctrl->SetFont(font); - if ( col.Ok() ) + if ( col.IsOk() ) m_textctrl->SetForegroundColour(col); + m_textctrl->Refresh(); + + // update the state of the bold/italic/underlined menu items + wxMenuBar *mbar = GetMenuBar(); + if ( mbar ) + { + mbar->Check(Font_Light, font.GetWeight() == wxFONTWEIGHT_LIGHT); + mbar->Check(Font_Bold, font.GetWeight() == wxFONTWEIGHT_BOLD); + + mbar->Check(Font_Italic, font.GetStyle() == wxFONTSTYLE_ITALIC); +#ifndef __WXMSW__ + mbar->Check(Font_Slant, font.GetStyle() == wxFONTSTYLE_SLANT); +#endif + + mbar->Check(Font_Underlined, font.GetUnderlined()); + mbar->Check(Font_Strikethrough, font.GetStrikethrough()); + } } void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event)) @@ -502,7 +850,7 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event)) data.SetInitialFont(m_canvas->GetTextFont()); data.SetColour(m_canvas->GetColour()); - wxFontDialog dialog(this, &data); + wxFontDialog dialog(this, data); if ( dialog.ShowModal() == wxID_OK ) { wxFontData retData = dialog.GetFontData(); @@ -510,29 +858,31 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event)) wxColour colour = retData.GetColour(); DoChangeFont(font, colour); - - // update the state of the bold/italic/underlined menu items - wxMenuBar *mbar = GetMenuBar(); - if ( mbar ) - { - mbar->Check(Font_Bold, font.GetWeight() == wxFONTWEIGHT_BOLD); - mbar->Check(Font_Italic, font.GetStyle() == wxFONTSTYLE_ITALIC); - mbar->Check(Font_Underlined, font.GetUnderlined()); - } } } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); +} + +void MyFrame::OnTestTextValue(wxCommandEvent& WXUNUSED(event)) +{ + wxString value = m_textctrl->GetValue(); + m_textctrl->SetValue(value); + if ( m_textctrl->GetValue() != value ) + { + wxLogError(wxT("Text value changed after getting and setting it")); + } } void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_FILEDLG // first, choose the file static wxString s_dir, s_file; - wxFileDialog dialog(this, "Open an email message file", + wxFileDialog dialog(this, wxT("Open an email message file"), s_dir, s_file); if ( dialog.ShowModal() != wxID_OK ) return; @@ -550,8 +900,8 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) wxString charset; - static const char *prefix = "Content-Type: text/plain; charset="; - const size_t len = strlen(prefix); + static const wxChar *prefix = wxT("Content-Type: text/plain; charset="); + const size_t len = wxStrlen(prefix); size_t n, count = file.GetLineCount(); for ( n = 0; n < count; n++ ) @@ -569,10 +919,10 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) { // found! const wxChar *pc = line.c_str() + len; - if ( *pc == '"' ) + if ( *pc == wxT('"') ) pc++; - while ( *pc && *pc != '"' ) + while ( *pc && *pc != wxT('"') ) { charset += *pc++; } @@ -590,7 +940,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) } // ok, now get the corresponding encoding - wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset); + wxFontEncoding fontenc = wxFontMapper::Get()->CharsetToEncoding(charset); if ( fontenc == wxFONTENCODING_SYSTEM ) { wxLogError(wxT("Charset '%s' is unsupported."), charset.c_str()); @@ -600,11 +950,11 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) m_textctrl->LoadFile(filename); if ( fontenc == wxFONTENCODING_UTF8 || - !wxTheFontMapper->IsEncodingAvailable(fontenc) ) + !wxFontMapper::Get()->IsEncodingAvailable(fontenc) ) { // try to find some similar encoding: wxFontEncoding encAlt; - if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) ) + if ( wxFontMapper::Get()->GetAltForEncoding(fontenc, &encAlt) ) { wxEncodingConverter conv; @@ -626,12 +976,13 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) } // and now create the correct font - if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) ) + if ( !DoEnumerateFamilies(false, fontenc, true /* silent */) ) { - wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, - wxFONTWEIGHT_NORMAL, FALSE /* !underlined */, + wxFont font(wxNORMAL_FONT->GetPointSize(), + wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, false /* !underlined */, wxEmptyString /* facename */, fontenc); - if ( font.Ok() ) + if ( font.IsOk() ) { DoChangeFont(font); } @@ -641,13 +992,14 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) wxFontMapper::GetEncodingDescription(fontenc).c_str()); } } +#endif // wxUSE_FILEDLG } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox("wxWindows font demo\n" - "(c) 1999 Vadim Zeitlin", - "About Font", + wxMessageBox(wxT("wxWidgets font sample\n") + wxT("(c) 1999-2006 Vadim Zeitlin"), + wxString(wxT("About ")) + SAMPLE_TITLE, wxOK | wxICON_INFORMATION, this); } @@ -660,15 +1012,11 @@ BEGIN_EVENT_TABLE(MyCanvas, wxWindow) END_EVENT_TABLE() MyCanvas::MyCanvas( wxWindow *parent ) - : wxWindow( parent, -1 ), + : wxWindow( parent, wxID_ANY ), m_colour(*wxRED), m_font(*wxNORMAL_FONT) { } -MyCanvas::~MyCanvas() -{ -} - void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc(this); @@ -677,6 +1025,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) // set background dc.SetBackground(wxBrush(wxT("white"), wxSOLID)); dc.Clear(); + dc.SetFont(m_font); // one text line height wxCoord hLine = dc.GetCharHeight(); @@ -687,30 +1036,36 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) // output the font name/info wxString fontInfo; - fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"), + + fontInfo.Printf(wxT("Face name: %s, family: %s"), + m_font.GetFaceName().c_str(), + m_font.GetFamilyString().c_str()); + + dc.DrawText(fontInfo, x, y); + y += hLine; + + fontInfo.Printf(wxT("Size: %d points or %d pixels; %d*%d average char size"), m_font.GetPointSize(), - m_font.GetFamilyString().c_str(), - wxTheFontMapper-> - GetEncodingDescription(m_font.GetEncoding()).c_str()); + m_font.GetPixelSize().y, + dc.GetCharWidth(), dc.GetCharHeight()); dc.DrawText(fontInfo, x, y); y += hLine; - - fontInfo.Printf(wxT("Style: %s, weight: %s, fixed width: %s"), + + fontInfo.Printf(wxT("Style: %s, weight: %s, fixed width: %s, encoding: %s"), m_font.GetStyleString().c_str(), m_font.GetWeightString().c_str(), - m_font.IsFixedWidth() ? _T("yes") : _T("no")); + m_font.IsFixedWidth() ? wxT("yes") : wxT("no"), + wxFontMapper::GetEncodingDescription(m_font.GetEncoding())); dc.DrawText(fontInfo, x, y); y += hLine; - if ( m_font.Ok() ) + if ( m_font.IsOk() ) { - wxNativeFontInfo *info = m_font.GetNativeFontInfo(); + const wxNativeFontInfo *info = m_font.GetNativeFontInfo(); if ( info ) { - delete info; - wxString fontDesc = m_font.GetNativeFontInfoUserDesc(); fontInfo.Printf(wxT("Native font info: %s"), fontDesc.c_str()); @@ -722,11 +1077,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) y += hLine; // prepare to draw the font - dc.SetFont(m_font); dc.SetTextForeground(m_colour); // the size of one cell (Normally biggest char + small margin) - long maxCharWidth, maxCharHeight; + wxCoord maxCharWidth, maxCharHeight; dc.GetTextExtent(wxT("W"), &maxCharWidth, &maxCharHeight); int w = maxCharWidth + 5, h = maxCharHeight + 4; @@ -737,9 +1091,9 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { for ( int j = 0; j < 32; j++ ) { - wxChar c = 32 * (i + 1) + j; + wxChar c = (wxChar)(32 * (i + 1) + j); - long charWidth, charHeight; + wxCoord charWidth, charHeight; dc.GetTextExtent(c, &charWidth, &charHeight); dc.DrawText ( @@ -751,7 +1105,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) } // draw the lines between them - dc.SetPen(wxPen(wxColour("blue"), 1, wxSOLID)); + dc.SetPen(wxPen(wxColour(wxT("blue")), 1, wxSOLID)); int l; // horizontal