Removed spurious </a> after <img> tag

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 963b004a32725bd19737067473aa580c332b00fa..7ef9add570cbb6feb6e4271e0004eda726464aba 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -10,23 +10,27 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #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
 #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/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


@@ -50,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; }


@@ -81,6 +85,17 @@ 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 OnBold(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 OnEnumerateFamilies(wxCommandEvent& WXUNUSED(event))
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
     void OnEnumerateFamilies(wxCommandEvent& WXUNUSED(event))


@@ -89,15 +104,17 @@ public:
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 

-    void OnSize(wxSizeEvent& event);
+    void OnCheckNativeToFromString(wxCommandEvent& event);

 
 protected:
 
 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 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;
     MyCanvas   *m_canvas;
 
     wxTextCtrl *m_textctrl;
     MyCanvas   *m_canvas;


@@ -117,11 +134,23 @@ enum
     // menu items
     Font_Quit = 1,
     Font_About,
     // menu items
     Font_Quit = 1,
     Font_About,

+    Font_ViewMsg,
+    Font_IncSize,
+    Font_DecSize,
+    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_EnumFixedFamilies,
     Font_EnumEncodings,
     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,

+    Font_CheckNativeToFromString,

     Font_Max
 };
 
     Font_Max
 };
 


@@ -134,14 +163,27 @@ 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_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_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_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


@@ -164,7 +206,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);


@@ -184,23 +226,49 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size), m_textctrl(NULL)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& 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_Choose, "&Select font...\tCtrl-S",
-                     "Select a standard font");
+    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_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,
-                     "Enumerate f&ixed font families\tCtrl-I");
-    menuFont->Append(Font_EnumEncodings,
+    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");
+
+    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,
+                     "Enumerate fi&xed font families\tCtrl-X");
+    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");
 


@@ -208,107 +276,143 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, "&File");
     menuBar->Append(menuFont, "F&ont");
     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();
     SetStatusText("Welcome to wxWindows font demo!");
 }
 
 
     // create a status bar just for fun (by default with 1 pane only)
     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(wxT("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();
 

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

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

-void MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, wxFontEncoding encoding)
-{
-    class MyFontEnumerator : public wxFontEnumerator
-    {
-    public:
-        bool GotAny() const { return !m_facenames.IsEmpty(); }
+// -------------------------------------------------------------

 
 

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

 
 

-    protected:
-        virtual bool OnFontFamily(const wxString& family)
-        {
-            m_facenames.Add(family);
+    const wxArrayString& GetFacenames() const
+        { return m_facenames; }

 
 

-            return TRUE;
-        }
+protected:
+    virtual bool OnFacename(const wxString& facename)
+    {
+        m_facenames.Add(facename);
+        return TRUE;
+    }

 
     private:
         wxArrayString m_facenames;
 
     private:
         wxArrayString m_facenames;

-    } fontEnumerator;
+} fontEnumerator;

 
 

-    fontEnumerator.EnumerateFamilies(encoding, fixedWidthOnly);
+bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
+                                  wxFontEncoding encoding,
+                                  bool silent)
+{
+    MyFontEnumerator fontEnumerator;
+
+    fontEnumerator.EnumerateFacenames(encoding, fixedWidthOnly);

 
     if ( fontEnumerator.GotAny() )
     {
 
     if ( fontEnumerator.GotAny() )
     {

-        int n, nFacenames = fontEnumerator.GetFacenames().GetCount();
-        wxLogStatus(this, "Found %d %sfonts",
-                    nFacenames, fixedWidthOnly ? "fixed width " : "");
+        int nFacenames = fontEnumerator.GetFacenames().GetCount();
+        if ( !silent )
+        {
+            wxLogStatus(this, wxT("Found %d %sfonts"),
+                        nFacenames, fixedWidthOnly ? wxT("fixed width ") : wxT(""));
+        }

 
 

-        wxString *facenames = new wxString[nFacenames];
-        for ( n = 0; n < nFacenames; n++ )
-            facenames[n] = fontEnumerator.GetFacenames().Item(n);
+        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);
+
+            n = wxGetSingleChoiceIndex("Choose a facename", "Font demo",
+                                       nFacenames, facenames, this);

 
 

-        n = wxGetSingleChoiceIndex("Choose a facename", "Font demo",
-                                   nFacenames, facenames, this);
-        if ( n != -1 )
+            if ( n != -1 )
+                facename = facenames[n];
+
+            delete [] facenames;
+        }
+
+        if ( !facename.IsEmpty() )

         {
         {

-            wxFont font(14, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
-                        wxFONTWEIGHT_NORMAL, FALSE, facenames[n], encoding);
+            wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                        wxFONTWEIGHT_NORMAL, FALSE, facename, encoding);

 
             DoChangeFont(font);
         }
 
 
             DoChangeFont(font);
         }
 

-        delete [] facenames;
+        return TRUE;

     }
     }

-    else
+    else if ( !silent )

     {
     {

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

     }
     }

+
+    return FALSE;

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


@@ -326,22 +430,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",
                                    WXSIZEOF(encodingNames),
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
                                    WXSIZEOF(encodingNames),

-                                   (char **)encodingNames,
+                                   encodingNames,

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


@@ -350,10 +454,80 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
+void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Resize(GetSize(), font);
+    wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();

 
 

+    if ( fontInfo.IsEmpty() )
+    {
+        wxLogError(wxT("Native font info string is empty!"));
+    }
+    else
+    {
+        wxFont *font = wxFont::New(fontInfo);
+        if ( fontInfo != font->GetNativeFontInfoDesc() )
+            wxLogError(wxT("wxNativeFontInfo ToString()/FromString() broken!"));
+        else
+            wxLogMessage(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str());
+
+        delete font;
+     }
+}
+
+void MyFrame::DoResizeFont(int diff)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetPointSize(font.GetPointSize() + diff);
+    DoChangeFont(font);
+}
+
+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)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetUnderlined(event.IsChecked());
+    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);
     if ( col.Ok() )
         m_canvas->SetColour(col);
     m_canvas->SetTextFont(font);
     if ( col.Ok() )
         m_canvas->SetColour(col);


@@ -370,7 +544,7 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event))
     data.SetInitialFont(m_canvas->GetTextFont());
     data.SetColour(m_canvas->GetColour());
 
     data.SetInitialFont(m_canvas->GetTextFont());
     data.SetColour(m_canvas->GetColour());
 

-    wxFontDialog dialog(this, &data);
+    wxFontDialog dialog(this, data);

     if ( dialog.ShowModal() == wxID_OK )
     {
         wxFontData retData = dialog.GetFontData();
     if ( dialog.ShowModal() == wxID_OK )
     {
         wxFontData retData = dialog.GetFontData();


@@ -378,6 +552,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());
+        }

     }
 }
 
     }
 }
 


@@ -387,43 +570,127 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(TRUE);
 }
 
     Close(TRUE);
 }
 

-void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxMessageBox("wxWindows font demo\n"
-                 "(c) 1999 Vadim Zeitlin",
-                 "About Font",
-                 wxOK | wxICON_INFORMATION, this);
-}
+    // 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;

 
 

-void MyFrame::OnSize(wxSizeEvent& event)
-{
-    wxSize size = event.GetSize();
+    // save for the next time
+    s_dir = dialog.GetDirectory();
+    s_file = dialog.GetFilename();

 
 

-    Resize(size);
+    wxString filename = dialog.GetPath();

 
 

-    event.Skip();
-}
+    // 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 wxChar *pc = line.c_str() + len;
+            if ( *pc == '"' )
+                pc++;
+
+            while ( *pc && *pc != '"' )
+            {
+                charset += *pc++;
+            }
+
+            break;
+        }
+    }
+
+    if ( !charset )
+    {
+        wxLogError(wxT("The file '%s' doesn't contain charset information."),
+                   filename.c_str());

 
 

-void MyFrame::Resize(const wxSize& size, const wxFont& font)
-{
-    if ( !m_textctrl )

         return;
         return;

+    }

 
 

-    wxCoord h;
-    if ( font.Ok() )
+    // ok, now get the corresponding encoding
+    wxFontEncoding fontenc = wxFontMapper::Get()->CharsetToEncoding(charset);
+    if ( fontenc == wxFONTENCODING_SYSTEM )

     {
     {

-        wxClientDC dc(this);
-        dc.SetFont(font);
+        wxLogError(wxT("Charset '%s' is unsupported."), charset.c_str());
+        return;
+    }
+
+    m_textctrl->LoadFile(filename);

 
 

-        h = 4*dc.GetCharHeight() + 4;
+    if ( fontenc == wxFONTENCODING_UTF8 ||
+            !wxFontMapper::Get()->IsEncodingAvailable(fontenc) )
+    {
+        // try to find some similar encoding:
+        wxFontEncoding encAlt;
+        if ( wxFontMapper::Get()->GetAltForEncoding(fontenc, &encAlt) )
+        {
+            wxEncodingConverter conv;
+
+            if (conv.Init(fontenc, encAlt))
+            {
+                fontenc = encAlt;
+                m_textctrl -> SetValue(conv.Convert(m_textctrl -> GetValue()));
+            }
+            else
+            {
+                wxLogWarning(wxT("Cannot convert from '%s' to '%s'."),
+                             wxFontMapper::GetEncodingDescription(fontenc).c_str(),
+                             wxFontMapper::GetEncodingDescription(encAlt).c_str());
+            }
+        }
+        else
+            wxLogWarning(wxT("No fonts for encoding '%s' on this system."),
+                         wxFontMapper::GetEncodingDescription(fontenc).c_str());

     }
     }

-    else
+
+    // and now create the correct font
+    if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) )

     {
     {

-        h = m_textctrl->GetSize().y;
+        wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                    wxFONTWEIGHT_NORMAL, FALSE /* !underlined */,
+                    wxEmptyString /* facename */, fontenc);
+        if ( font.Ok() )
+        {
+            DoChangeFont(font);
+        }
+        else
+        {
+            wxLogWarning(wxT("No fonts for encoding '%s' on this system."),
+                         wxFontMapper::GetEncodingDescription(fontenc).c_str());
+        }

     }
     }

+}

 
 

-    m_textctrl->SetSize(0, 0, size.x, h);
-    m_canvas->SetSize(0, h, size.x, size.y - h);
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("wxWindows font demo\n"
+                 "(c) 1999 Vadim Zeitlin",
+                 "About Font",
+                 wxOK | wxICON_INFORMATION, this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -435,10 +702,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()


@@ -451,36 +717,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 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.GetFamilyString().c_str(),

+                    wxFontMapper::Get()->
+                        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, x, y);
+    y += hLine;
+
+    if ( m_font.Ok() )
+    {
+        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;
+        }
+    }

 
 

-    dc.DrawText(fontInfo, 5, 5);
+    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
+            );

         }
     }
 
         }
     }
 


@@ -489,17 +797,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);

     }
 }
     }
 }