A few tweaks and cleanups

[wxWidgets.git] / samples / font / font.cpp

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index b46a5d2ffb07b4a4cd318dc48897e9c3730aa5ea..b92b86b2550c6dfb193fb9c54448115887aa0359 100644 (file)
--- 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
 #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 wxWindows headers

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 


@@ -54,7 +54,7 @@ class MyCanvas: public wxWindow
 {
 public:
     MyCanvas( wxWindow *parent );
 {
 public:
     MyCanvas( wxWindow *parent );

-    ~MyCanvas();
+    virtual ~MyCanvas();

 
     // accessors for the frame
     const wxFont& GetTextFont() const { return m_font; }
 
     // accessors for the frame
     const wxFont& GetTextFont() const { return m_font; }


@@ -93,6 +93,8 @@ public:
     void OnItalic(wxCommandEvent& event);
     void OnUnderline(wxCommandEvent& event);
 
     void OnItalic(wxCommandEvent& event);
     void OnUnderline(wxCommandEvent& event);
 

+    void OnwxPointerFont(wxCommandEvent& event);
+

     void OnViewMsg(wxCommandEvent& event);
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
     void OnViewMsg(wxCommandEvent& event);
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);


@@ -138,6 +140,11 @@ enum
     Font_Bold,
     Font_Italic,
     Font_Underlined,
     Font_Bold,
     Font_Italic,
     Font_Underlined,

+    Font_wxNORMAL_FONT,
+    Font_wxSMALL_FONT,
+    Font_wxITALIC_FONT,
+    Font_wxSWISS_FONT,
+

     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,
     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,


@@ -164,6 +171,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Bold, MyFrame::OnBold)
     EVT_MENU(Font_Italic, MyFrame::OnItalic)
     EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
     EVT_MENU(Font_Bold, MyFrame::OnBold)
     EVT_MENU(Font_Italic, MyFrame::OnItalic)
     EVT_MENU(Font_Underlined, MyFrame::OnUnderline)

+
+    EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont)
+    EVT_MENU(Font_wxSMALL_FONT, MyFrame::OnwxPointerFont)
+    EVT_MENU(Font_wxITALIC_FONT, MyFrame::OnwxPointerFont)
+    EVT_MENU(Font_wxSWISS_FONT, MyFrame::OnwxPointerFont)
+

     EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
 
     EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
     EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
 
     EVT_MENU(Font_Choose, MyFrame::OnSelectFont)


@@ -233,6 +246,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFont->Append(Font_Italic, "&Oblique\tCtrl-O", "Toggle italic state", TRUE);
     menuFont->Append(Font_Underlined, "&Underlined\tCtrl-U",
                      "Toggle underlined 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->AppendSeparator();
     menuFont->Append(Font_CheckNativeToFromString,
                      "Check Native Font Info To/From String");
     menuFont->AppendSeparator();
     menuFont->Append(Font_CheckNativeToFromString,
                      "Check Native Font Info To/From String");


@@ -240,6 +254,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *menuSelect = new wxMenu;
     menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S",
                      "Select a standard font");
     wxMenu *menuSelect = new wxMenu;
     menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S",
                      "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);
+

     menuSelect->AppendSeparator();
     menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
     menuSelect->Append(Font_EnumFixedFamilies,
     menuSelect->AppendSeparator();
     menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
     menuSelect->Append(Font_EnumFixedFamilies,


@@ -484,6 +506,26 @@ void MyFrame::OnUnderline(wxCommandEvent& event)
     DoChangeFont(font);
 }
 
     DoChangeFont(font);
 }
 

+void MyFrame::OnwxPointerFont(wxCommandEvent& event)
+{
+    wxFont font;
+
+    switch (event.GetId())
+    {
+        case Font_wxNORMAL_FONT : font = wxFont(*wxNORMAL_FONT); break;
+        case Font_wxSMALL_FONT  : font = wxFont(*wxSMALL_FONT); break;
+        case Font_wxITALIC_FONT : font = wxFont(*wxITALIC_FONT); break;
+        case Font_wxSWISS_FONT  : font = wxFont(*wxSWISS_FONT); break;
+        default                 : font = wxFont(*wxNORMAL_FONT); break;
+    }
+
+    GetMenuBar()->Check(Font_Bold, FALSE);
+    GetMenuBar()->Check(Font_Italic, FALSE);
+    GetMenuBar()->Check(Font_Underlined, FALSE);
+
+    DoChangeFont(font);
+}
+

 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
     m_canvas->SetTextFont(font);
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
     m_canvas->SetTextFont(font);


@@ -590,7 +632,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     }
 
     // ok, now get the corresponding encoding
     }
 
     // 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());
     if ( fontenc == wxFONTENCODING_SYSTEM )
     {
         wxLogError(wxT("Charset '%s' is unsupported."), charset.c_str());


@@ -600,11 +642,11 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     m_textctrl->LoadFile(filename);
 
     if ( fontenc == wxFONTENCODING_UTF8 ||
     m_textctrl->LoadFile(filename);
 
     if ( fontenc == wxFONTENCODING_UTF8 ||

-            !wxTheFontMapper->IsEncodingAvailable(fontenc) )
+            !wxFontMapper::Get()->IsEncodingAvailable(fontenc) )

     {
         // try to find some similar encoding:
         wxFontEncoding encAlt;
     {
         // try to find some similar encoding:
         wxFontEncoding encAlt;

-        if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )
+        if ( wxFontMapper::Get()->GetAltForEncoding(fontenc, &encAlt) )

         {
             wxEncodingConverter conv;
 
         {
             wxEncodingConverter conv;
 


@@ -690,7 +732,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(),
     fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),

-                    wxTheFontMapper->
+                    wxFontMapper::Get()->

                         GetEncodingDescription(m_font.GetEncoding()).c_str());
 
     dc.DrawText(fontInfo, x, y);
                         GetEncodingDescription(m_font.GetEncoding()).c_str());
 
     dc.DrawText(fontInfo, x, y);