Replaced /'s with \'s as BCC requires \'s for path names

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 2873c93ef75e186c8c2d90b87e660feee611655c..d919ea6a59c6f8b07299fc15b17dd66f6fc10a5a 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -27,6 +27,9 @@
 #include <wx/choicdlg.h>
 #include <wx/fontdlg.h>
 #include <wx/fontenum.h>
 #include <wx/choicdlg.h>
 #include <wx/fontdlg.h>
 #include <wx/fontenum.h>

+#include <wx/fontmap.h>
+#include <wx/encconv.h>
+#include <wx/textfile.h>

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -81,6 +84,10 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnIncFont(wxCommandEvent& event) { DoResizeFont(+2); }
+    void OnDecFont(wxCommandEvent& event) { DoResizeFont(-2); }
+
+    void OnViewMsg(wxCommandEvent& event);

     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
     void OnEnumerateFamilies(wxCommandEvent& WXUNUSED(event))
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
     void OnEnumerateFamilies(wxCommandEvent& WXUNUSED(event))


@@ -89,14 +96,22 @@ public:
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 

+    void OnCheckNativeToFromString(wxCommandEvent& event);
+

     void OnSize(wxSizeEvent& event);
 
 protected:
     void OnSize(wxSizeEvent& event);
 
 protected:

-    void DoEnumerateFamilies(bool fixedWidthOnly,
-                             wxFontEncoding encoding = wxFONTENCODING_SYSTEM);
+    bool DoEnumerateFamilies(bool fixedWidthOnly,
+                             wxFontEncoding encoding = wxFONTENCODING_SYSTEM,
+                             bool silent = FALSE);
+
+    void DoResizeFont(int diff);
+    void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour);

 
     void Resize(const wxSize& size, const wxFont& font = wxNullFont);
 
 
     void Resize(const wxSize& size, const wxFont& font = wxNullFont);
 

+    size_t      m_fontSize; // in points
+

     wxTextCtrl *m_textctrl;
     MyCanvas   *m_canvas;
 
     wxTextCtrl *m_textctrl;
     MyCanvas   *m_canvas;
 


@@ -115,11 +130,15 @@ enum
     // menu items
     Font_Quit = 1,
     Font_About,
     // menu items
     Font_Quit = 1,
     Font_About,

+    Font_ViewMsg,
+    Font_IncSize,
+    Font_DecSize,

     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,
     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,

+    Font_CheckNativeToFromString,

     Font_Max
 };
 
     Font_Max
 };
 


@@ -133,11 +152,15 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)
     EVT_MENU(Font_About, MyFrame::OnAbout)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)
     EVT_MENU(Font_About, MyFrame::OnAbout)

+    EVT_MENU(Font_IncSize, MyFrame::OnIncFont)
+    EVT_MENU(Font_DecSize, MyFrame::OnDecFont)
+    EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg)

     EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
     EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding)
     EVT_MENU(Font_EnumFamilies, MyFrame::OnEnumerateFamilies)
     EVT_MENU(Font_EnumFixedFamilies, MyFrame::OnEnumerateFixedFamilies)
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)
     EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
     EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding)
     EVT_MENU(Font_EnumFamilies, MyFrame::OnEnumerateFamilies)
     EVT_MENU(Font_EnumFixedFamilies, MyFrame::OnEnumerateFixedFamilies)
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)

+    EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)

 
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()


@@ -180,27 +203,38 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, -1, title, pos, size), m_textctrl(NULL)

 {
 {

+    m_fontSize = 12;
+

     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 

+    menuFile->Append(Font_ViewMsg, "&View...\tCtrl-V",
+                     "View an email message file");
+    menuFile->AppendSeparator();

     menuFile->Append(Font_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();
     menuFile->Append(Font_Quit, "E&xit\tAlt-X", "Quit this program");
 
     wxMenu *menuFont = new wxMenu;
     menuFile->Append(Font_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();
     menuFile->Append(Font_Quit, "E&xit\tAlt-X", "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->AppendSeparator();

     menuFont->Append(Font_Choose, "&Select font...\tCtrl-S",
                      "Select a standard font");
     menuFont->AppendSeparator();
     menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
     menuFont->Append(Font_EnumFixedFamilies,
     menuFont->Append(Font_Choose, "&Select font...\tCtrl-S",
                      "Select a standard font");
     menuFont->AppendSeparator();
     menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
     menuFont->Append(Font_EnumFixedFamilies,

-                     "Enumerate f&ixed font families\tCtrl-I");
+                     "Enumerate fi&xed font families\tCtrl-X");

     menuFont->Append(Font_EnumEncodings,
                      "Enumerate &encodings\tCtrl-E");
     menuFont->Append(Font_EnumFamiliesForEncoding,
                      "Find font for en&coding...\tCtrl-C",
                      "Find font families for given encoding");
     menuFont->Append(Font_EnumEncodings,
                      "Enumerate &encodings\tCtrl-E");
     menuFont->Append(Font_EnumFamiliesForEncoding,
                      "Find font for en&coding...\tCtrl-C",
                      "Find font families for given encoding");

+    menuFont->AppendSeparator();
+    menuFont->Append(Font_CheckNativeToFromString,
+                     "Check Native Font Info To/From String");

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;


@@ -219,38 +253,40 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_canvas = new MyCanvas(this);
 
     // create a status bar just for fun (by default with 1 pane only)
     m_canvas = new MyCanvas(this);
 
     // create a status bar just for fun (by default with 1 pane only)

-    CreateStatusBar(2);
-    SetStatusText("Welcome to wxWindows!");
+    CreateStatusBar();
+    SetStatusText("Welcome to wxWindows font demo!");

 }
 
 }
 

+// --------------------------------------------------------

 
 

-// event handlers
-void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
+class MyEncodingEnumerator : public wxFontEnumerator

 {
 {

-    class MyEncodingEnumerator : public wxFontEnumerator
-    {
-    public:
-        MyEncodingEnumerator() { m_n = 0; }
-
-        const wxString& GetText() const { return m_text; }
+public:
+    MyEncodingEnumerator()
+        { m_n = 0; }

 
 

-    protected:
-        virtual bool OnFontEncoding(const wxString& family,
-                                    const wxString& encoding)
-        {
-            wxString text;
-            text.Printf("Encoding %d: %s (available in family '%s')\n",
-                         ++m_n, encoding.c_str(), family.c_str());
-            m_text += text;
+    const wxString& GetText() const
+        { return m_text; }

 
 

-            return TRUE;
-        }
+protected:
+    virtual bool OnFontEncoding(const wxString& facename,
+                                const wxString& encoding)
+    {
+        wxString text;
+        text.Printf("Encoding %d: %s (available in facename '%s')\n",
+                    ++m_n, encoding.c_str(), facename.c_str());
+        m_text += text;
+        return TRUE;
+    }

 
 

-    private:
-        size_t m_n;
+private:
+    size_t m_n;
+    wxString m_text;
+};

 
 

-        wxString m_text;
-    } fontEnumerator;
+void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
+{
+    MyEncodingEnumerator fontEnumerator;

 
     fontEnumerator.EnumerateEncodings();
 
 
     fontEnumerator.EnumerateEncodings();
 


@@ -258,45 +294,84 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
                  fontEnumerator.GetText().c_str());
 }
 
                  fontEnumerator.GetText().c_str());
 }
 

-void MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, wxFontEncoding encoding)
+// -------------------------------------------------------------
+
+class MyFontEnumerator : public wxFontEnumerator

 {
 {

-    class MyFontEnumerator : public wxFontEnumerator
+public:
+    bool GotAny() const
+        { return !m_facenames.IsEmpty(); }
+
+    const wxArrayString& GetFacenames() const
+        { return m_facenames; }
+
+protected:
+    virtual bool OnFacename(const wxString& facename)

     {
     {

-    public:
-        MyFontEnumerator() { m_n = 0; }
+        m_facenames.Add(facename);
+        return TRUE;
+    }
+
+    private:
+        wxArrayString m_facenames;
+} fontEnumerator;

 
 

-        bool GotAny() const { return m_n; }
+bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
+                                  wxFontEncoding encoding,
+                                  bool silent)
+{
+    MyFontEnumerator fontEnumerator;

 
 

-        const wxString& GetText() const { return m_text; }
+    fontEnumerator.EnumerateFacenames(encoding, fixedWidthOnly);

 
 

-    protected:
-        virtual bool OnFontFamily(const wxString& family)
+    if ( fontEnumerator.GotAny() )
+    {
+        int nFacenames = fontEnumerator.GetFacenames().GetCount();
+        if ( !silent )

         {
         {

-            wxString text;
-            text.Printf("Font family %d: %s\n", ++m_n, family.c_str());
-            m_text += text;
+            wxLogStatus(this, "Found %d %sfonts",
+                        nFacenames, fixedWidthOnly ? "fixed width " : "");
+        }

 
 

-            return TRUE;
+        wxString facename;
+        if ( silent )
+        {
+            // choose the first
+            facename = fontEnumerator.GetFacenames().Item(0);

         }
         }

+        else
+        {
+            // let the user choose
+            wxString *facenames = new wxString[nFacenames];
+            int n;
+            for ( n = 0; n < nFacenames; n++ )
+                facenames[n] = fontEnumerator.GetFacenames().Item(n);

 
 

-    private:
-        size_t m_n;
+            n = wxGetSingleChoiceIndex("Choose a facename", "Font demo",
+                                       nFacenames, facenames, this);

 
 

-        wxString m_text;
-    } fontEnumerator;
+            if ( n != -1 )
+                facename = facenames[n];

 
 

-    fontEnumerator.EnumerateFamilies(encoding, fixedWidthOnly);
+            delete [] facenames;
+        }

 
 

-    if ( fontEnumerator.GotAny() )
-    {
-        wxLogMessage("Enumerating %s font families:\n%s",
-                     fixedWidthOnly ? "fixed width" : "all",
-                     fontEnumerator.GetText().c_str());
+        if ( !facename.IsEmpty() )
+        {
+            wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                        wxFONTWEIGHT_NORMAL, FALSE, facename, encoding);
+
+            DoChangeFont(font);
+        }
+
+        return TRUE;

     }
     }

-    else
+    else if ( !silent )

     {
         wxLogWarning("No such fonts found.");
     }
     {
         wxLogWarning("No such fonts found.");
     }

+
+    return FALSE;

 }
 
 void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))


@@ -314,21 +389,22 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
         wxFONTENCODING_CP1252,
     };
 
         wxFONTENCODING_CP1252,
     };
 

-    static const char *encodingNames[] =
+    static const wxString encodingNames[] =

     {
     {

-        "West European (Latin 1)",
-        "Central European (Latin 2)",
-        "Cyrillic (Latin 5)",
-        "Greek (Latin 7)",
-        "West European new (Latin 0)",
+        "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",
         "KOI8-R",

-        "Windows Latin 2",
-        "Windows Cyrillic",
-        "Windows Latin 1",
+        "Windows Central European (CP 1250)",
+        "Windows Cyrillic (CP 1251)",
+        "Windows Western European (CP 1252)",

     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",

-                                   WXSIZEOF(encodingNames), encodingNames,
+                                   WXSIZEOF(encodingNames),
+                                   encodingNames,

                                    this);
 
     if ( n != -1 )
                                    this);
 
     if ( n != -1 )


@@ -337,6 +413,56 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
+{
+    wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();
+
+    if ( fontInfo.IsEmpty() )
+    {
+        wxLogError("Native font info string is empty!");
+    }
+    else
+    {
+        wxFont *font = wxFont::New(fontInfo);
+        if ( fontInfo != font->GetNativeFontInfoDesc() )
+            wxLogError("wxNativeFontInfo ToString()/FromString() broken!");
+        else
+            wxLogError("wxNativeFontInfo works: %s", fontInfo.c_str());
+        delete font;
+     }
+}
+
+void MyFrame::DoResizeFont(int diff)
+{
+    wxFont fontOld = m_canvas->GetTextFont();
+
+    DoChangeFont(
+        wxFont(
+               fontOld.GetPointSize() + diff,
+               fontOld.GetFamily(),
+               fontOld.GetStyle(),
+               fontOld.GetWeight(),
+               fontOld.GetUnderlined(),
+               fontOld.GetFaceName(),
+               fontOld.GetEncoding()
+              )
+    );
+}
+
+void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
+{
+    Resize(GetClientSize(), font);
+
+    m_canvas->SetTextFont(font);
+    if ( col.Ok() )
+        m_canvas->SetColour(col);
+    m_canvas->Refresh();
+
+    m_textctrl->SetFont(font);
+    if ( col.Ok() )
+        m_textctrl->SetForegroundColour(col);
+}
+

 void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event))
 {
     wxFontData data;
 void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event))
 {
     wxFontData data;


@@ -350,14 +476,7 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event))
         wxFont font = retData.GetChosenFont();
         wxColour colour = retData.GetColour();
 
         wxFont font = retData.GetChosenFont();
         wxColour colour = retData.GetColour();
 

-        Resize(GetSize(), font);
-
-        m_canvas->SetTextFont(font);
-        m_canvas->SetColour(colour);
-        m_canvas->Refresh();
-
-        m_textctrl->SetFont(font);
-        m_textctrl->SetForegroundColour(colour);
+        DoChangeFont(font, colour);

     }
 }
 
     }
 }
 


@@ -367,6 +486,121 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(TRUE);
 }
 
     Close(TRUE);
 }
 

+void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
+{
+    // first, choose the file
+    static wxString s_dir, s_file;
+    wxFileDialog dialog(this, "Open an email message file",
+                        s_dir, s_file);
+    if ( dialog.ShowModal() != wxID_OK )
+        return;
+
+    // save for the next time
+    s_dir = dialog.GetDirectory();
+    s_file = dialog.GetFilename();
+
+    wxString filename = dialog.GetPath();
+
+    // load it and search for Content-Type header
+    wxTextFile file(filename);
+    if ( !file.Open() )
+        return;
+
+    wxString charset;
+
+    static const char *prefix = "Content-Type: text/plain; charset=";
+    const size_t len = strlen(prefix);
+
+    size_t n, count = file.GetLineCount();
+    for ( n = 0; n < count; n++ )
+    {
+        wxString line = file[n];
+
+        if ( !line )
+        {
+            // if it is an email message, headers are over, no need to parse
+            // all the file
+            break;
+        }
+
+        if ( line.Left(len) == prefix )
+        {
+            // found!
+            const char *pc = line.c_str() + len;
+            if ( *pc == '"' )
+                pc++;
+
+            while ( *pc && *pc != '"' )
+            {
+                charset += *pc++;
+            }
+
+            break;
+        }
+    }
+
+    if ( !charset )
+    {
+        wxLogError("The file '%s' doesn't contain charset information.",
+                   filename.c_str());
+
+        return;
+    }
+
+    // ok, now get the corresponding encoding
+    wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset);
+    if ( fontenc == wxFONTENCODING_SYSTEM )
+    {
+        wxLogError("Charset '%s' is unsupported.", charset.c_str());
+        return;
+    }
+
+    m_textctrl->LoadFile(filename);
+
+    if ( fontenc == wxFONTENCODING_UTF8 ||
+            !wxTheFontMapper->IsEncodingAvailable(fontenc) )
+    {
+        // try to find some similar encoding:
+        wxFontEncoding encAlt;
+        if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )
+        {
+            wxEncodingConverter conv;
+
+            if (conv.Init(fontenc, encAlt))
+            {
+                fontenc = encAlt;
+                m_textctrl -> SetValue(conv.Convert(m_textctrl -> GetValue()));
+            }
+            else
+            {
+                wxLogWarning("Cannot convert from '%s' to '%s'.",
+                             wxFontMapper::GetEncodingDescription(fontenc).c_str(),
+                             wxFontMapper::GetEncodingDescription(encAlt).c_str());
+            }
+        }
+        else
+            wxLogWarning("No fonts for encoding '%s' on this system.",
+                         wxFontMapper::GetEncodingDescription(fontenc).c_str());
+    }
+
+    // and now create the correct font
+    if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) )
+    {
+        wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                    wxFONTWEIGHT_NORMAL, FALSE /* !underlined */,
+                    wxEmptyString /* facename */, fontenc);
+        if ( font.Ok() )
+        {
+            DoChangeFont(font);
+        }
+        else
+        {
+            wxLogWarning("No fonts for encoding '%s' on this system.",
+                         wxFontMapper::GetEncodingDescription(fontenc).c_str());
+        }
+    }
+}
+

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox("wxWindows font demo\n"
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox("wxWindows font demo\n"


@@ -377,20 +611,23 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {

-    wxSize size = event.GetSize();
+    Resize(GetClientSize());

 
 

-    Resize(size);
+    event.Skip();

 }
 
 void MyFrame::Resize(const wxSize& size, const wxFont& font)
 {
 }
 
 void MyFrame::Resize(const wxSize& size, const wxFont& font)
 {

+    if ( !m_textctrl )
+        return;
+

     wxCoord h;
     if ( font.Ok() )
     {
         wxClientDC dc(this);
         dc.SetFont(font);
 
     wxCoord h;
     if ( font.Ok() )
     {
         wxClientDC dc(this);
         dc.SetFont(font);
 

-        h = 4*dc.GetCharHeight() + 4;
+        h = 10*(dc.GetCharHeight() + 1);

     }
     else
     {
     }
     else
     {


@@ -410,10 +647,9 @@ BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )

-        : wxWindow( parent, -1 )
+        : wxWindow( parent, -1 ),
+          m_colour(*wxRED), m_font(*wxNORMAL_FONT)

 {
 {

-    m_font = *wxNORMAL_FONT;
-    m_colour = *wxRED;

 }
 
 MyCanvas::~MyCanvas()
 }
 
 MyCanvas::~MyCanvas()


@@ -431,13 +667,22 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // output the font name/info
     wxString fontInfo;
 
     // output the font name/info
     wxString fontInfo;

-    fontInfo.Printf("Font family is '%s', style '%s', weight '%s'",
+    fontInfo.Printf("Font size is %d points, family is %s, style %s, weight %s",
+                    m_font.GetPointSize(),

                     m_font.GetFamilyString().c_str(),
                     m_font.GetStyleString().c_str(),
                     m_font.GetWeightString().c_str());
 
     dc.DrawText(fontInfo, 5, 5);
 
                     m_font.GetFamilyString().c_str(),
                     m_font.GetStyleString().c_str(),
                     m_font.GetWeightString().c_str());
 
     dc.DrawText(fontInfo, 5, 5);
 

+    if ( m_font.Ok() )
+    {
+        wxString fontDesc = m_font.GetNativeFontInfoDesc();
+        dc.SetFont(m_font);
+        fontInfo.Printf("Native font info: %s", fontDesc.c_str());
+        dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
+    }
+

     // prepare to draw the font
     dc.SetFont(m_font);
     dc.SetTextForeground(m_colour);
     // prepare to draw the font
     dc.SetFont(m_font);
     dc.SetTextForeground(m_colour);