X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..841f23e18a9d9e3d987b60422c3a220571868337:/samples/font/font.cpp?ds=sidebyside diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 61eeecb067..7fe8717618 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -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; } @@ -105,6 +112,8 @@ public: void OnEnumerateEncodings(wxCommandEvent& event); void OnCheckNativeToFromString(wxCommandEvent& event); + void OnCheckNativeToFromUserString(wxCommandEvent& event); + void OnCheckFaceName(wxCommandEvent& event); protected: bool DoEnumerateFamilies(bool fixedWidthOnly, @@ -152,6 +161,8 @@ enum Font_EnumFixedFamilies, Font_EnumEncodings, Font_CheckNativeToFromString, + Font_CheckNativeToFromUserString, + Font_CheckFaceName, Font_Max }; @@ -178,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) @@ -229,6 +243,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) { m_fontSize = 12; + SetIcon(wxIcon(sample_xpm)); + // create a menu bar wxMenu *menuFile = new wxMenu; @@ -243,14 +259,18 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state"), true); - menuFont->Append(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state"), true); - menuFont->Append(Font_Underlined, wxT("&Underlined\tCtrl-U"), - wxT("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, 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, wxT("&Select font...\tCtrl-S"), @@ -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(wxT("Welcome to wxWidgets font demo!")); +#endif // wxUSE_STATUSBAR } // -------------------------------------------------------- @@ -314,8 +336,8 @@ 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; } @@ -375,6 +397,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, } wxString facename; + if ( silent ) { // choose the first @@ -397,7 +420,7 @@ 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); @@ -460,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!")); } @@ -476,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(); @@ -521,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); } @@ -538,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)) @@ -554,15 +629,6 @@ 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()); - } } } @@ -574,6 +640,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_FILEDLG // first, choose the file static wxString s_dir, s_file; wxFileDialog dialog(this, wxT("Open an email message file"), @@ -685,6 +752,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) wxFontMapper::GetEncodingDescription(fontenc).c_str()); } } +#endif // wxUSE_FILEDLG } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -709,10 +777,6 @@ MyCanvas::MyCanvas( wxWindow *parent ) { } -MyCanvas::~MyCanvas() -{ -} - void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { wxPaintDC dc(this); @@ -734,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(), - wxFontMapper::Get()-> + wxFontMapper:: GetEncodingDescription(m_font.GetEncoding()).c_str()); dc.DrawText(fontInfo, x, y); @@ -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);