X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..cf858bab79c18d709b3fa3375202c2ddf3d599e5:/samples/font/font.cpp diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 1dbcd33367..0bd4df1c5b 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -102,10 +102,10 @@ public: void OnBold(wxCommandEvent& event); void OnLight(wxCommandEvent& event); - + void OnItalic(wxCommandEvent& event); void OnSlant(wxCommandEvent& event); - + void OnUnderline(wxCommandEvent& event); void OnwxPointerFont(wxCommandEvent& event); @@ -123,7 +123,7 @@ public: void OnSetNativeDesc(wxCommandEvent& event); void OnSetNativeUserDesc(wxCommandEvent& event); - + void OnSetFamily(wxCommandEvent& event); void OnSetFaceName(wxCommandEvent& event); void OnSetEncoding(wxCommandEvent& event); @@ -164,21 +164,21 @@ enum // menu items Font_Quit = wxID_EXIT, Font_About = wxID_ABOUT, - + Font_ViewMsg = wxID_HIGHEST+1, Font_TestTextValue, Font_IncSize, Font_DecSize, - + Font_Bold, Font_Light, - + Font_Italic, Font_Slant, - + Font_Underlined, - + // standard global wxFont objects: Font_wxNORMAL_FONT, Font_wxSMALL_FONT, @@ -223,13 +223,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_IncSize, MyFrame::OnIncFont) EVT_MENU(Font_DecSize, MyFrame::OnDecFont) - + EVT_MENU(Font_Bold, MyFrame::OnBold) EVT_MENU(Font_Light, MyFrame::OnLight) - + EVT_MENU(Font_Italic, MyFrame::OnItalic) EVT_MENU(Font_Slant, MyFrame::OnSlant) - + EVT_MENU(Font_Underlined, MyFrame::OnUnderline) EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont) @@ -282,9 +282,8 @@ bool MyApp::OnInit() 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 + // Show it 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 @@ -302,7 +301,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) { m_fontSize = wxNORMAL_FONT->GetPointSize(); - SetIcon(wxIcon(sample_xpm)); + SetIcon(wxICON(sample)); // create a menu bar wxMenu *menuFile = new wxMenu; @@ -339,7 +338,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) wxT("Set &user font description\tShift-Ctrl-U")); menuFont->AppendSeparator(); menuFont->Append(Font_SetFamily, wxT("Set font family")); - menuFont->Append(Font_SetFaceName, wxT("Set font face name")); + menuFont->Append(Font_SetFaceName, wxT("Set font face name")); menuFont->Append(Font_SetEncoding, wxT("Set font &encoding\tShift-Ctrl-E")); wxMenu *menuSelect = new wxMenu; @@ -354,21 +353,21 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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"), + 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"), + 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"), + 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"), + 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"), + 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, wxT("Enumerate font &families\tCtrl-F")); menuSelect->Append(Font_EnumFixedFamilies, @@ -821,12 +820,12 @@ void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col) { 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()); } } @@ -1012,6 +1011,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(); @@ -1022,7 +1022,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) // output the font name/info wxString fontInfo; - + fontInfo.Printf(wxT("Face name: %s, family: %s"), m_font.GetFaceName().c_str(), m_font.GetFamilyString().c_str()); @@ -1030,18 +1030,19 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawText(fontInfo, x, y); y += hLine; - fontInfo.Printf(wxT("Size: %d points, encoding: %s"), + fontInfo.Printf(wxT("Size: %d points or %d pixels; %d*%d average char size"), m_font.GetPointSize(), - wxFontMapper:: - 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() ? wxT("yes") : wxT("no")); + m_font.IsFixedWidth() ? wxT("yes") : wxT("no"), + wxFontMapper::GetEncodingDescription(m_font.GetEncoding())); dc.DrawText(fontInfo, x, y); y += hLine; @@ -1062,7 +1063,6 @@ 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)