X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/818503a1826c8d32340234318afe6de35f756c2f..841f23e18a9d9e3d987b60422c3a220571868337:/samples/font/font.cpp?ds=sidebyside diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 6c9dff7a50..7fe8717618 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 standard wxWindows headers +// need because it includes almost all standard wxWidgets headers #ifndef WX_PRECOMP #include "wx/wx.h" @@ -32,6 +32,13 @@ #include "wx/splitter.h" #include "wx/textfile.h" +#include "../sample.xpm" + +#ifdef __WXMAC__ +#undef wxFontDialog +#include "wx/mac/fontdlg.h" +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -54,7 +61,7 @@ class MyCanvas: public wxWindow { public: MyCanvas( wxWindow *parent ); - virtual ~MyCanvas(); + virtual ~MyCanvas(){}; // accessors for the frame const wxFont& GetTextFont() const { return m_font; } @@ -86,8 +93,8 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); - void OnIncFont(wxCommandEvent& event) { DoResizeFont(+2); } - void OnDecFont(wxCommandEvent& event) { DoResizeFont(-2); } + void OnIncFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(+2); } + void OnDecFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(-2); } void OnBold(wxCommandEvent& event); void OnItalic(wxCommandEvent& event); @@ -99,17 +106,19 @@ public: void OnSelectFont(wxCommandEvent& event); void OnEnumerateFamiliesForEncoding(wxCommandEvent& event); void OnEnumerateFamilies(wxCommandEvent& WXUNUSED(event)) - { DoEnumerateFamilies(FALSE); } + { DoEnumerateFamilies(false); } void OnEnumerateFixedFamilies(wxCommandEvent& WXUNUSED(event)) - { DoEnumerateFamilies(TRUE); } + { DoEnumerateFamilies(true); } void OnEnumerateEncodings(wxCommandEvent& event); void OnCheckNativeToFromString(wxCommandEvent& event); + void OnCheckNativeToFromUserString(wxCommandEvent& event); + void OnCheckFaceName(wxCommandEvent& event); protected: bool DoEnumerateFamilies(bool fixedWidthOnly, wxFontEncoding encoding = wxFONTENCODING_SYSTEM, - bool silent = FALSE); + bool silent = false); void DoResizeFont(int diff); void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour); @@ -120,7 +129,7 @@ protected: MyCanvas *m_canvas; private: - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -144,6 +153,7 @@ enum Font_wxSMALL_FONT, Font_wxITALIC_FONT, Font_wxSWISS_FONT, + Font_Standard, Font_Choose = 100, Font_EnumFamiliesForEncoding, @@ -151,14 +161,16 @@ enum Font_EnumFixedFamilies, Font_EnumEncodings, Font_CheckNativeToFromString, + Font_CheckNativeToFromUserString, + Font_CheckFaceName, Font_Max }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -177,7 +189,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_wxITALIC_FONT, MyFrame::OnwxPointerFont) EVT_MENU(Font_wxSWISS_FONT, MyFrame::OnwxPointerFont) + EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString) + EVT_MENU(Font_CheckNativeToFromUserString, MyFrame::OnCheckNativeToFromUserString) + EVT_MENU(Font_CheckFaceName, MyFrame::OnCheckFaceName) EVT_MENU(Font_Choose, MyFrame::OnSelectFont) EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding) @@ -186,7 +201,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -205,17 +220,17 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame("Font wxWindows demo", + MyFrame *frame = new MyFrame(wxT("Font wxWidgets demo"), wxPoint(50, 50), wxSize(600, 400)); // Show it and tell the application that it's our main window - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); // 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; } // ---------------------------------------------------------------------------- @@ -224,68 +239,73 @@ 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; + SetIcon(wxIcon(sample_xpm)); + // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(Font_ViewMsg, "&View...\tCtrl-V", - "View an email message file"); + 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->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_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state")); + menuFont->AppendCheckItem(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state")); + menuFont->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"), + wxT("Toggle underlined state")); menuFont->AppendSeparator(); menuFont->Append(Font_CheckNativeToFromString, - "Check Native Font Info To/From String"); + wxT("Check Native Font Info To/From String")); + menuFont->Append(Font_CheckNativeToFromUserString, + wxT("Check Native Font Info User String")); + menuFont->Append(Font_CheckFaceName, + wxT("Check font face name")); 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, "wxNORMAL_FONT", "Normal font used by wxWindows"); - menuStdFonts->Append(Font_wxSMALL_FONT, "wxSMALL_FONT", "Small font used by wxWindows"); - menuStdFonts->Append(Font_wxITALIC_FONT, "wxITALIC_FONT", "Italic font used by wxWindows"); - menuStdFonts->Append(Font_wxSWISS_FONT, "wxSWISS_FONT", "Swiss font used by wxWindows"); - menuSelect->Append(-2, "Standar&d fonts", menuStdFonts); + 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); 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); @@ -293,9 +313,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 } // -------------------------------------------------------- @@ -314,10 +336,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: @@ -350,7 +372,7 @@ protected: virtual bool OnFacename(const wxString& facename) { m_facenames.Add(facename); - return TRUE; + return true; } private: @@ -375,6 +397,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, } wxString facename; + if ( silent ) { // choose the first @@ -388,7 +411,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, for ( n = 0; n < nFacenames; n++ ) facenames[n] = fontEnumerator.GetFacenames().Item(n); - n = wxGetSingleChoiceIndex("Choose a facename", "Font demo", + n = wxGetSingleChoiceIndex(wxT("Choose a facename"), wxT("Font demo"), nFacenames, facenames, this); if ( n != -1 ) @@ -397,22 +420,22 @@ 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); + 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)) @@ -425,6 +448,7 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event)) wxFONTENCODING_ISO8859_7, wxFONTENCODING_ISO8859_15, wxFONTENCODING_KOI8, + wxFONTENCODING_KOI8_U, wxFONTENCODING_CP1250, wxFONTENCODING_CP1251, wxFONTENCODING_CP1252, @@ -432,25 +456,26 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event)) static const wxString encodingNames[] = { - "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)", + wxT("Western European (ISO-8859-1)"), + wxT("Central European (ISO-8859-2)"), + wxT("Cyrillic (ISO-8859-5)"), + wxT("Greek (ISO-8859-7)"), + wxT("Western European with Euro (ISO-8859-15)"), + wxT("KOI8-R"), + wxT("KOI8-U"), + wxT("Windows Central European (CP 1250)"), + wxT("Windows Cyrillic (CP 1251)"), + wxT("Windows Western European (CP 1252)"), }; - int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo", + int n = wxGetSingleChoiceIndex(wxT("Choose an encoding"), wxT("Font demo"), WXSIZEOF(encodingNames), encodingNames, this); if ( n != -1 ) { - DoEnumerateFamilies(FALSE, encodings[n]); + DoEnumerateFamilies(false, encodings[n]); } } @@ -458,7 +483,7 @@ void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event)) { wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc(); - if ( fontInfo.IsEmpty() ) + if ( fontInfo.empty() ) { wxLogError(wxT("Native font info string is empty!")); } @@ -474,6 +499,53 @@ void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnCheckFaceName(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 + { + wxASSERT_MSG(font.Ok(), wxT("The font should now be valid")); + DoChangeFont(font); + } + else + { + wxASSERT_MSG(!font.Ok(), 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::OnCheckNativeToFromUserString(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)) + { + wxASSERT_MSG(font.Ok(), wxT("The font should now be valid")); + DoChangeFont(font); + } + else + { + wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid")); + wxMessageBox(wxT("Error trying to create a font with such description...")); + } +} + void MyFrame::DoResizeFont(int diff) { wxFont font = m_canvas->GetTextFont(); @@ -519,10 +591,6 @@ void MyFrame::OnwxPointerFont(wxCommandEvent& event) default : font = wxFont(*wxNORMAL_FONT); break; } - GetMenuBar()->Check(Font_Bold, FALSE); - GetMenuBar()->Check(Font_Italic, FALSE); - GetMenuBar()->Check(Font_Underlined, FALSE); - DoChangeFont(font); } @@ -536,6 +604,15 @@ void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col) m_textctrl->SetFont(font); if ( col.Ok() ) m_textctrl->SetForegroundColour(col); + + // 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::OnSelectFont(wxCommandEvent& WXUNUSED(event)) @@ -544,7 +621,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(); @@ -552,29 +629,21 @@ 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::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; @@ -592,8 +661,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++ ) @@ -611,10 +680,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++; } @@ -632,7 +701,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()); @@ -642,11 +711,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; @@ -668,10 +737,10 @@ 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 */, + wxFONTWEIGHT_NORMAL, false /* !underlined */, wxEmptyString /* facename */, fontenc); if ( font.Ok() ) { @@ -683,13 +752,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 demo\n") + wxT("(c) 1999 Vadim Zeitlin"), + wxT("About Font"), wxOK | wxICON_INFORMATION, this); } @@ -702,15 +772,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); @@ -732,7 +798,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"), m_font.GetPointSize(), m_font.GetFamilyString().c_str(), - wxTheFontMapper-> + wxFontMapper:: GetEncodingDescription(m_font.GetEncoding()).c_str()); dc.DrawText(fontInfo, x, y); @@ -748,11 +814,9 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if ( m_font.Ok() ) { - 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()); @@ -779,7 +843,7 @@ 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; dc.GetTextExtent(c, &charWidth, &charHeight); @@ -793,7 +857,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) } // draw the lines between them - dc.SetPen(wxPen(wxColour("blue"), 1, wxSOLID)); + dc.SetPen(wxPen(wxColour(_T("blue")), 1, wxSOLID)); int l; // horizontal