Corrections in light of recent toolbar and other changes

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 7948599d422e9dcb66e6166ad83ca22b0fa8a268..b46a5d2ffb07b4a4cd318dc48897e9c3730aa5ea 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -19,17 +19,18 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all <standard< wxWindows headers
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all <standard< wxWindows headers
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
+    #include "wx/wx.h"

 
 

-    #include <wx/log.h>
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include <wx/choicdlg.h>
-#include <wx/fontdlg.h>
-#include <wx/fontenum.h>
-#include <wx/fontmap.h>
-#include <wx/encconv.h>
-#include <wx/textfile.h>
+#include "wx/choicdlg.h"
+#include "wx/fontdlg.h"
+#include "wx/fontenum.h"
+#include "wx/fontmap.h"
+#include "wx/encconv.h"
+#include "wx/splitter.h"
+#include "wx/textfile.h"

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


@@ -84,9 +85,14 @@ 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 OnIncFont(wxCommandEvent& event) { DoResizeFont(+2); }
     void OnDecFont(wxCommandEvent& event) { DoResizeFont(-2); }
 

+    void OnBold(wxCommandEvent& event);
+    void OnItalic(wxCommandEvent& event);
+    void OnUnderline(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);


@@ -98,8 +104,6 @@ public:
 
     void OnCheckNativeToFromString(wxCommandEvent& event);
 
 
     void OnCheckNativeToFromString(wxCommandEvent& event);
 

-    void OnSize(wxSizeEvent& event);
-

 protected:
     bool DoEnumerateFamilies(bool fixedWidthOnly,
                              wxFontEncoding encoding = wxFONTENCODING_SYSTEM,
 protected:
     bool DoEnumerateFamilies(bool fixedWidthOnly,
                              wxFontEncoding encoding = wxFONTENCODING_SYSTEM,


@@ -108,8 +112,6 @@ protected:
     void DoResizeFont(int diff);
     void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour);
 
     void DoResizeFont(int diff);
     void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour);
 

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

     size_t      m_fontSize; // in points
 
     wxTextCtrl *m_textctrl;
     size_t      m_fontSize; // in points
 
     wxTextCtrl *m_textctrl;


@@ -133,6 +135,9 @@ enum
     Font_ViewMsg,
     Font_IncSize,
     Font_DecSize,
     Font_ViewMsg,
     Font_IncSize,
     Font_DecSize,

+    Font_Bold,
+    Font_Italic,
+    Font_Underlined,

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


@@ -151,18 +156,21 @@ enum
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)

+    EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg)

     EVT_MENU(Font_About, MyFrame::OnAbout)
     EVT_MENU(Font_About, MyFrame::OnAbout)

+

     EVT_MENU(Font_IncSize, MyFrame::OnIncFont)
     EVT_MENU(Font_DecSize, MyFrame::OnDecFont)
     EVT_MENU(Font_IncSize, MyFrame::OnIncFont)
     EVT_MENU(Font_DecSize, MyFrame::OnDecFont)

-    EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg)
+    EVT_MENU(Font_Bold, MyFrame::OnBold)
+    EVT_MENU(Font_Italic, MyFrame::OnItalic)
+    EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
+    EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
+

     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()
 
 // Create a new application object: this macro will allow wxWindows to create
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create


@@ -185,7 +193,7 @@ bool MyApp::OnInit()
 {
     // Create the main application window
     MyFrame *frame = new MyFrame("Font wxWindows demo",
 {
     // Create the main application window
     MyFrame *frame = new MyFrame("Font wxWindows demo",

-                                 wxPoint(50, 50), wxSize(450, 340));
+                                 wxPoint(50, 50), wxSize(600, 400));

 
     // Show it and tell the application that it's our main window
     frame->Show(TRUE);
 
     // Show it and tell the application that it's our main window
     frame->Show(TRUE);


@@ -221,36 +229,47 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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_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->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->AppendSeparator();
     menuFont->AppendSeparator();

-    menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
-    menuFont->Append(Font_EnumFixedFamilies,
+    menuFont->Append(Font_CheckNativeToFromString,
+                     "Check Native Font Info To/From String");
+
+    wxMenu *menuSelect = new wxMenu;
+    menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S",
+                     "Select a standard font");
+    menuSelect->AppendSeparator();
+    menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
+    menuSelect->Append(Font_EnumFixedFamilies,

                      "Enumerate fi&xed font families\tCtrl-X");
                      "Enumerate fi&xed font families\tCtrl-X");

-    menuFont->Append(Font_EnumEncodings,
+    menuSelect->Append(Font_EnumEncodings,

                      "Enumerate &encodings\tCtrl-E");
                      "Enumerate &encodings\tCtrl-E");

-    menuFont->Append(Font_EnumFamiliesForEncoding,
+    menuSelect->Append(Font_EnumFamiliesForEncoding,

                      "Find font for en&coding...\tCtrl-C",
                      "Find font families for given encoding");
                      "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;
     menuBar->Append(menuFile, "&File");
     menuBar->Append(menuFont, "F&ont");
 
     // 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");

 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

-    m_textctrl = new wxTextCtrl(this, -1,
+    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",
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
 
                                 "Paste text here to see how it looks\n"
                                 "like in the given font",
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
 

-    m_canvas = new MyCanvas(this);
+    m_canvas = new MyCanvas(splitter);
+
+    splitter->SplitHorizontally(m_textctrl, m_canvas, 100);

 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();


@@ -262,10 +281,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:

-    MyEncodingEnumerator() 
+    MyEncodingEnumerator()

         { m_n = 0; }
 
         { m_n = 0; }
 

-    const wxString& GetText() const 
+    const wxString& GetText() const

         { return m_text; }
 
 protected:
         { return m_text; }
 
 protected:


@@ -273,7 +292,7 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
                                 const wxString& encoding)
     {
         wxString text;

-        text.Printf("Encoding %d: %s (available in facename '%s')\n",
+        text.Printf(wxT("Encoding %d: %s (available in facename '%s')\n"),

                     ++m_n, encoding.c_str(), facename.c_str());
         m_text += text;
         return TRUE;
                     ++m_n, encoding.c_str(), facename.c_str());
         m_text += text;
         return TRUE;


@@ -290,7 +309,7 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
 
     fontEnumerator.EnumerateEncodings();
 
 
     fontEnumerator.EnumerateEncodings();
 

-    wxLogMessage("Enumerating all available encodings:\n%s",
+    wxLogMessage(wxT("Enumerating all available encodings:\n%s"),

                  fontEnumerator.GetText().c_str());
 }
 
                  fontEnumerator.GetText().c_str());
 }
 


@@ -299,10 +318,10 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:

-    bool GotAny() const 
+    bool GotAny() const

         { return !m_facenames.IsEmpty(); }
 
         { return !m_facenames.IsEmpty(); }
 

-    const wxArrayString& GetFacenames() const 
+    const wxArrayString& GetFacenames() const

         { return m_facenames; }
 
 protected:
         { return m_facenames; }
 
 protected:


@@ -329,8 +348,8 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
         int nFacenames = fontEnumerator.GetFacenames().GetCount();
         if ( !silent )
         {
         int nFacenames = fontEnumerator.GetFacenames().GetCount();
         if ( !silent )
         {

-            wxLogStatus(this, "Found %d %sfonts",
-                        nFacenames, fixedWidthOnly ? "fixed width " : "");
+            wxLogStatus(this, wxT("Found %d %sfonts"),
+                        nFacenames, fixedWidthOnly ? wxT("fixed width ") : wxT(""));

         }
 
         wxString facename;
         }
 
         wxString facename;


@@ -368,7 +387,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
     }
     else if ( !silent )
     {
     }
     else if ( !silent )
     {

-        wxLogWarning("No such fonts found.");
+        wxLogWarning(wxT("No such fonts found."));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -391,15 +410,15 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 
     static const wxString 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",


@@ -419,40 +438,54 @@ void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
 
     if ( fontInfo.IsEmpty() )
     {
 
     if ( fontInfo.IsEmpty() )
     {

-        wxLogError("Native font info string is empty!");
+        wxLogError(wxT("Native font info string is empty!"));

     }
     else
     {
         wxFont *font = wxFont::New(fontInfo);
         if ( fontInfo != font->GetNativeFontInfoDesc() )
     }
     else
     {
         wxFont *font = wxFont::New(fontInfo);
         if ( fontInfo != font->GetNativeFontInfoDesc() )

-            wxLogError("wxNativeFontInfo ToString()/FromString() broken!");
+            wxLogError(wxT("wxNativeFontInfo ToString()/FromString() broken!"));

         else
         else

-            wxLogError("wxNativeFontInfo works: %s", fontInfo.c_str());
+            wxLogMessage(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str());
+

         delete font;
      }
 }
 
 void MyFrame::DoResizeFont(int diff)
 {
         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()
-              )
-    );
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetPointSize(font.GetPointSize() + diff);
+    DoChangeFont(font);

 }
 
 }
 

-void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
+void MyFrame::OnBold(wxCommandEvent& event)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetWeight(event.IsChecked() ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL);
+    DoChangeFont(font);
+}
+
+void MyFrame::OnItalic(wxCommandEvent& event)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetStyle(event.IsChecked() ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL);
+    DoChangeFont(font);
+}
+
+void MyFrame::OnUnderline(wxCommandEvent& event)

 {
 {

-    Resize(GetClientSize(), font);
+    wxFont font = m_canvas->GetTextFont();

 
 

+    font.SetUnderlined(event.IsChecked());
+    DoChangeFont(font);
+}
+
+void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
+{

     m_canvas->SetTextFont(font);
     if ( col.Ok() )
         m_canvas->SetColour(col);
     m_canvas->SetTextFont(font);
     if ( col.Ok() )
         m_canvas->SetColour(col);


@@ -477,6 +510,15 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event))
         wxColour colour = retData.GetColour();
 
         DoChangeFont(font, colour);
         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());
+        }

     }
 }
 
     }
 }
 


@@ -526,7 +568,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
         if ( line.Left(len) == prefix )
         {
             // found!
         if ( line.Left(len) == prefix )
         {
             // found!

-            const char *pc = line.c_str() + len;
+            const wxChar *pc = line.c_str() + len;

             if ( *pc == '"' )
                 pc++;
 
             if ( *pc == '"' )
                 pc++;
 


@@ -541,7 +583,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
     if ( !charset )
     {
 
     if ( !charset )
     {

-        wxLogError("The file '%s' doesn't contain charset information.",
+        wxLogError(wxT("The file '%s' doesn't contain charset information."),

                    filename.c_str());
 
         return;
                    filename.c_str());
 
         return;


@@ -551,20 +593,21 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset);
     if ( fontenc == wxFONTENCODING_SYSTEM )
     {
     wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset);
     if ( fontenc == wxFONTENCODING_SYSTEM )
     {

-        wxLogError("Charset '%s' is unsupported.", charset.c_str());
+        wxLogError(wxT("Charset '%s' is unsupported."), charset.c_str());

         return;
     }
 
     m_textctrl->LoadFile(filename);
 
         return;
     }
 
     m_textctrl->LoadFile(filename);
 

-    if (!wxTheFontMapper->IsEncodingAvailable(fontenc))
+    if ( fontenc == wxFONTENCODING_UTF8 ||
+            !wxTheFontMapper->IsEncodingAvailable(fontenc) )

     {
         // try to find some similar encoding:
         wxFontEncoding encAlt;
         if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )
         {
             wxEncodingConverter conv;
     {
         // try to find some similar encoding:
         wxFontEncoding encAlt;
         if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )
         {
             wxEncodingConverter conv;

-            
+

             if (conv.Init(fontenc, encAlt))
             {
                 fontenc = encAlt;
             if (conv.Init(fontenc, encAlt))
             {
                 fontenc = encAlt;


@@ -572,13 +615,13 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
             }
             else
             {
             }
             else
             {

-                wxLogWarning("Cannot convert from '%s' to '%s'.",
+                wxLogWarning(wxT("Cannot convert from '%s' to '%s'."),

                              wxFontMapper::GetEncodingDescription(fontenc).c_str(),
                              wxFontMapper::GetEncodingDescription(encAlt).c_str());
             }
         }
         else
                              wxFontMapper::GetEncodingDescription(fontenc).c_str(),
                              wxFontMapper::GetEncodingDescription(encAlt).c_str());
             }
         }
         else

-            wxLogWarning("No fonts for encoding '%s' on this system.",
+            wxLogWarning(wxT("No fonts for encoding '%s' on this system."),

                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
     }
 
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
     }
 


@@ -594,7 +637,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
         }
         else
         {
         }
         else
         {

-            wxLogWarning("No fonts for encoding '%s' on this system.",
+            wxLogWarning(wxT("No fonts for encoding '%s' on this system."),

                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
         }
     }
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
         }
     }


@@ -608,35 +651,6 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
                  wxOK | wxICON_INFORMATION, this);
 }
 
                  wxOK | wxICON_INFORMATION, this);
 }
 

-void MyFrame::OnSize(wxSizeEvent& event)
-{
-    Resize(GetClientSize());
-
-    event.Skip();
-}
-
-void MyFrame::Resize(const wxSize& size, const wxFont& font)
-{
-    if ( !m_textctrl )
-        return;
-
-    wxCoord h;
-    if ( font.Ok() )
-    {
-        wxClientDC dc(this);
-        dc.SetFont(font);
-
-        h = 10*(dc.GetCharHeight() + 1);
-    }
-    else
-    {
-        h = m_textctrl->GetSize().y;
-    }
-
-    m_textctrl->SetSize(0, 0, size.x, h);
-    m_canvas->SetSize(0, h, size.x, size.y - h);
-}
-

 // ----------------------------------------------------------------------------
 // MyCanvas
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MyCanvas
 // ----------------------------------------------------------------------------


@@ -661,45 +675,78 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC(dc);
 
     // set background
     PrepareDC(dc);
 
     // set background

-    dc.SetBackground(wxBrush("white", wxSOLID));
+    dc.SetBackground(wxBrush(wxT("white"), wxSOLID));

     dc.Clear();
 
     dc.Clear();
 

+    // one text line height
+    wxCoord hLine = dc.GetCharHeight();
+
+    // the current text origin
+    wxCoord x = 5,
+            y = 5;
+

     // output the font name/info
     wxString fontInfo;
     // output the font name/info
     wxString fontInfo;

-    fontInfo.Printf("Font size is %d points, family is %s, style %s, weight %s",
+    fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"),

                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),

+                    wxTheFontMapper->
+                        GetEncodingDescription(m_font.GetEncoding()).c_str());
+
+    dc.DrawText(fontInfo, x, y);
+    y += hLine;
+
+    fontInfo.Printf(wxT("Style: %s, weight: %s, fixed width: %s"),

                     m_font.GetStyleString().c_str(),
                     m_font.GetStyleString().c_str(),

-                    m_font.GetWeightString().c_str());
+                    m_font.GetWeightString().c_str(),
+                    m_font.IsFixedWidth() ? _T("yes") : _T("no"));

 
 

-    dc.DrawText(fontInfo, 5, 5);
+    dc.DrawText(fontInfo, x, y);
+    y += hLine;

 
     if ( m_font.Ok() )
     {
 
     if ( m_font.Ok() )
     {

-        wxString fontDesc = m_font.GetNativeFontInfoDesc();
-        dc.SetFont(wxFont(fontDesc));
-        fontInfo.Printf("Native font info: %s", fontDesc.c_str());
-        dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
+        wxNativeFontInfo *info = m_font.GetNativeFontInfo();
+        if ( info )
+        {
+            delete info;
+
+            wxString fontDesc = m_font.GetNativeFontInfoUserDesc();
+            fontInfo.Printf(wxT("Native font info: %s"), fontDesc.c_str());
+
+            dc.DrawText(fontInfo, x, y);
+            y += hLine;
+        }

     }
 
     }
 

+    y += hLine;
+

     // 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);
 

-    // the size of one cell (char + small margin)
-    int w = dc.GetCharWidth() + 5,
-        h = dc.GetCharHeight() + 4;
+    // the size of one cell (Normally biggest char + small margin)
+    long maxCharWidth, maxCharHeight;
+    dc.GetTextExtent(wxT("W"), &maxCharWidth, &maxCharHeight);
+    int w = maxCharWidth + 5,
+        h = maxCharHeight + 4;

 
 

-    // the origin for our table
-    int x = 5,
-        y = 2*h;

 
     // print all font symbols from 32 to 256 in 7 rows of 32 chars each
 
     // print all font symbols from 32 to 256 in 7 rows of 32 chars each

-    for ( int i = 1; i < 8; i++ )
+    for ( int i = 0; i < 7; i++ )

     {
         for ( int j = 0; j < 32; j++ )
         {
     {
         for ( int j = 0; j < 32; j++ )
         {

-            dc.DrawText(char(32*i + j), x + w*j, y + h*i);
+            wxChar c = 32 * (i + 1) + j;
+
+            long charWidth, charHeight;
+            dc.GetTextExtent(c, &charWidth, &charHeight);
+            dc.DrawText
+            (
+                c,
+                x + w*j + (maxCharWidth - charWidth) / 2 + 1,
+                y + h*i + (maxCharHeight - charHeight) / 2
+            );

         }
     }
 
         }
     }
 


@@ -708,17 +755,16 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     int l;
 
     // horizontal
     int l;
 
     // horizontal

-    y += h;

     for ( l = 0; l < 8; l++ )
     {
         int yl = y + h*l - 2;
     for ( l = 0; l < 8; l++ )
     {
         int yl = y + h*l - 2;

-        dc.DrawLine(x - 2, yl, x + 32*w - 2, yl);
+        dc.DrawLine(x - 2, yl, x + 32*w - 1, yl);

     }
 
     // and vertical
     for ( l = 0; l < 33; l++ )
     {
         int xl = x + w*l - 2;
     }
 
     // and vertical
     for ( l = 0; l < 33; l++ )
     {
         int xl = x + w*l - 2;

-        dc.DrawLine(xl, y, xl, y + 7*h - 2);
+        dc.DrawLine(xl, y - 2, xl, y + 7*h - 1);

     }
 }
     }
 }