Add wxEVT_DIRCTRL_FILEACTIVATED wxDirCtrl event.

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index d919ea6a59c6f8b07299fc15b17dd66f6fc10a5a..8ffde87c072a7a0ca24995fd37c10ad4704f0c8b 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -10,26 +10,38 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // 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 wxWidgets 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/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"
+#include "wx/settings.h"
+
+#include "../sample.xpm"
+
+#ifdef __WXMAC__
+    #undef wxFontDialog
+    #include "wx/osx/fontdlg.h"
+#endif
+
+// used as title for several dialog boxes
+static const wxChar SAMPLE_TITLE[] = wxT("wxWidgets Font Sample");

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


@@ -53,7 +65,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; }


@@ -84,31 +96,54 @@ 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& WXUNUSED(event)) { DoResizeFont(+2); }
+    void OnDecFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(-2); }
+
+    void OnBold(wxCommandEvent& event);
+    void OnLight(wxCommandEvent& event);
+
+    void OnItalic(wxCommandEvent& event);
+    void OnSlant(wxCommandEvent& event);
+
+    void OnUnderline(wxCommandEvent& event);
+    void OnStrikethrough(wxCommandEvent& event);
+
+    void OnwxPointerFont(wxCommandEvent& event);
+    void OnwxSystemSettingsFont(wxCommandEvent& event);
+
+    void OnTestTextValue(wxCommandEvent& event);

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

-        { DoEnumerateFamilies(FALSE); }
+        { DoEnumerateFamilies(false); }

     void OnEnumerateFixedFamilies(wxCommandEvent& WXUNUSED(event))
     void OnEnumerateFixedFamilies(wxCommandEvent& WXUNUSED(event))

-        { DoEnumerateFamilies(TRUE); }
+        { DoEnumerateFamilies(true); }

     void OnEnumerateEncodings(wxCommandEvent& event);
 
     void OnEnumerateEncodings(wxCommandEvent& event);
 

-    void OnCheckNativeToFromString(wxCommandEvent& event);
+    void OnSetNativeDesc(wxCommandEvent& event);
+    void OnSetNativeUserDesc(wxCommandEvent& event);

 
 

-    void OnSize(wxSizeEvent& event);
+    void OnSetFamily(wxCommandEvent& event);
+    void OnSetFaceName(wxCommandEvent& event);
+    void OnSetEncoding(wxCommandEvent& event);

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

-                             bool silent = FALSE);
+                             bool silent = false);

 
     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);
+    // ask the user to choose an encoding and return it or
+    // wxFONTENCODING_SYSTEM if the dialog was cancelled
+    wxFontEncoding GetEncodingFromUser();
+
+    // ask the user to choose a font family and return it or
+    // wxFONTFAMILY_DEFAULT if the dialog was cancelled
+    wxFontFamily GetFamilyFromUser();

 
     size_t      m_fontSize; // in points
 
 
     size_t      m_fontSize; // in points
 


@@ -116,7 +151,7 @@ protected:
     MyCanvas   *m_canvas;
 
 private:
     MyCanvas   *m_canvas;
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -128,44 +163,104 @@ private:
 enum
 {
     // menu items
 enum
 {
     // menu items

-    Font_Quit = 1,
-    Font_About,
-    Font_ViewMsg,
+    Font_Quit = wxID_EXIT,
+    Font_About = wxID_ABOUT,
+
+    Font_ViewMsg = wxID_HIGHEST+1,
+    Font_TestTextValue,
+

     Font_IncSize,
     Font_DecSize,
     Font_IncSize,
     Font_DecSize,

+
+    Font_Bold,
+    Font_Light,
+
+    Font_Italic,
+    Font_Slant,
+
+    Font_Underlined,
+    Font_Strikethrough,
+
+    // standard global wxFont objects:
+    Font_wxNORMAL_FONT,
+    Font_wxSMALL_FONT,
+    Font_wxITALIC_FONT,
+    Font_wxSWISS_FONT,
+    Font_Standard,
+
+    // wxSystemSettings::GetFont possible objects:
+    Font_wxSYS_OEM_FIXED_FONT,
+    Font_wxSYS_ANSI_FIXED_FONT,
+    Font_wxSYS_ANSI_VAR_FONT,
+    Font_wxSYS_SYSTEM_FONT,
+    Font_wxSYS_DEVICE_DEFAULT_FONT,
+    Font_wxSYS_DEFAULT_GUI_FONT,
+    Font_SystemSettings,
+

     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_SetNativeDesc,
+    Font_SetNativeUserDesc,
+    Font_SetFamily,
+    Font_SetFaceName,
+    Font_SetEncoding,

     Font_Max
 };
 
 // ----------------------------------------------------------------------------
     Font_Max
 };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)
 // handlers) which process them. It can be also done at run-time, but for the
 // 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_TestTextValue, MyFrame::OnTestTextValue)
+    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_Light, MyFrame::OnLight)
+
+    EVT_MENU(Font_Italic, MyFrame::OnItalic)
+    EVT_MENU(Font_Slant, MyFrame::OnSlant)
+
+    EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
+    EVT_MENU(Font_Strikethrough, MyFrame::OnStrikethrough)
+
+    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_wxSYS_OEM_FIXED_FONT, MyFrame::OnwxSystemSettingsFont)
+    EVT_MENU(Font_wxSYS_ANSI_FIXED_FONT, MyFrame::OnwxSystemSettingsFont)
+    EVT_MENU(Font_wxSYS_ANSI_VAR_FONT, MyFrame::OnwxSystemSettingsFont)
+    EVT_MENU(Font_wxSYS_SYSTEM_FONT, MyFrame::OnwxSystemSettingsFont)
+    EVT_MENU(Font_wxSYS_DEVICE_DEFAULT_FONT, MyFrame::OnwxSystemSettingsFont)
+    EVT_MENU(Font_wxSYS_DEFAULT_GUI_FONT, MyFrame::OnwxSystemSettingsFont)
+
+    EVT_MENU(Font_SetNativeDesc, MyFrame::OnSetNativeDesc)
+    EVT_MENU(Font_SetNativeUserDesc, MyFrame::OnSetNativeUserDesc)
+    EVT_MENU(Font_SetFamily, MyFrame::OnSetFamily)
+    EVT_MENU(Font_SetFaceName, MyFrame::OnSetFaceName)
+    EVT_MENU(Font_SetEncoding, MyFrame::OnSetEncoding)
+

     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()
 
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -183,18 +278,20 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main application window
     // Create the main application window

-    MyFrame *frame = new MyFrame("Font wxWindows demo",
-                                 wxPoint(50, 50), wxSize(450, 340));
+    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
-    frame->Show(TRUE);
-    SetTopWindow(frame);
+    // Show it
+    frame->Show(true);

 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned 'false' here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

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


@@ -203,58 +300,114 @@ 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), m_textctrl(NULL)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), m_textctrl(NULL)

 {
 {

-    m_fontSize = 12;
+    m_fontSize = wxNORMAL_FONT->GetPointSize();
+
+    SetIcon(wxICON(sample));

 
     // 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->Append(Font_TestTextValue, wxT("&Test text value"),
+                     wxT("Verify that getting and setting text value doesn't change it"));
+    menuFile->Append(Font_ViewMsg, wxT("&View...\tCtrl-V"),
+                     wxT("View an email message file"));

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(Font_About, "&About...\tCtrl-A", "Show about dialog");
+    menuFile->Append(Font_About, wxT("&About\tCtrl-A"), wxT("Show about dialog"));

     menuFile->AppendSeparator();
     menuFile->AppendSeparator();

-    menuFile->Append(Font_Quit, "E&xit\tAlt-X", "Quit this program");
+    menuFile->Append(Font_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));

 
     wxMenu *menuFont = new wxMenu;
 
     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->Append(Font_IncSize, wxT("&Increase font size by 2 points\tCtrl-I"));
+    menuFont->Append(Font_DecSize, wxT("&Decrease font size by 2 points\tCtrl-D"));
+    menuFont->AppendSeparator();
+    menuFont->AppendCheckItem(Font_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state"));
+    menuFont->AppendCheckItem(Font_Light, wxT("&Light\tCtrl-L"), wxT("Toggle light state"));
+    menuFont->AppendSeparator();
+    menuFont->AppendCheckItem(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state"));
+#ifndef __WXMSW__
+    // under wxMSW slant == italic so there's no reason to provide another menu item for the same thing
+    menuFont->AppendCheckItem(Font_Slant, wxT("&Slant\tCtrl-S"), wxT("Toggle slant state"));
+#endif

     menuFont->AppendSeparator();
     menuFont->AppendSeparator();

-    menuFont->Append(Font_Choose, "&Select font...\tCtrl-S",
-                     "Select a standard font");
+    menuFont->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"),
+                              wxT("Toggle underlined state"));
+    menuFont->AppendCheckItem(Font_Strikethrough, wxT("&Strikethrough"),
+                              wxT("Toggle strikethrough state"));
+

     menuFont->AppendSeparator();
     menuFont->AppendSeparator();

-    menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
-    menuFont->Append(Font_EnumFixedFamilies,
-                     "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_SetNativeDesc,
+                     wxT("Set native font &description\tShift-Ctrl-D"));
+    menuFont->Append(Font_SetNativeUserDesc,
+                     wxT("Set &user font description\tShift-Ctrl-U"));

     menuFont->AppendSeparator();
     menuFont->AppendSeparator();

-    menuFont->Append(Font_CheckNativeToFromString,
-                     "Check Native Font Info To/From String");
+    menuFont->Append(Font_SetFamily, wxT("Set font family"));
+    menuFont->Append(Font_SetFaceName, wxT("Set font face name"));
+    menuFont->Append(Font_SetEncoding, wxT("Set font &encoding\tShift-Ctrl-E"));
+
+    wxMenu *menuSelect = new wxMenu;
+    menuSelect->Append(Font_Choose, wxT("&Select font...\tCtrl-S"),
+                       wxT("Select a standard font"));
+
+    wxMenu *menuStdFonts = new wxMenu;
+    menuStdFonts->Append(Font_wxNORMAL_FONT, wxT("wxNORMAL_FONT"), wxT("Normal font used by wxWidgets"));
+    menuStdFonts->Append(Font_wxSMALL_FONT,  wxT("wxSMALL_FONT"),  wxT("Small font used by wxWidgets"));
+    menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWidgets"));
+    menuStdFonts->Append(Font_wxSWISS_FONT,  wxT("wxSWISS_FONT"),  wxT("Swiss font used by wxWidgets"));
+    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"),
+                         wxT("Original equipment manufacturer dependent fixed-pitch 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"),
+                         wxT("Windows variable-pitch (proportional) 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"),
+                         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,
+                     wxT("Enumerate fi&xed font families\tCtrl-X"));
+    menuSelect->Append(Font_EnumEncodings,
+                     wxT("Enumerate &encodings\tCtrl-E"));
+    menuSelect->Append(Font_EnumFamiliesForEncoding,
+                     wxT("Find font for en&coding...\tCtrl-C"),
+                     wxT("Find font families for given encoding"));

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

-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(menuFont, "F&ont");
+    menuBar->Append(menuFile, wxT("&File"));
+    menuBar->Append(menuFont, wxT("F&ont"));
+    menuBar->Append(menuSelect, wxT("&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,
-                                "Paste text here to see how it looks\n"
-                                "like in the given font",
+    wxSplitterWindow *splitter = new wxSplitterWindow(this);
+
+    m_textctrl = new wxTextCtrl(splitter, wxID_ANY,
+                                wxT("Paste text here to see how it looks\nlike in the given font"),

                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
 
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE);
 

-    m_canvas = new MyCanvas(this);
+    m_canvas = new MyCanvas(splitter);

 
 

+    splitter->SplitHorizontally(m_textctrl, m_canvas, 100);
+
+#if wxUSE_STATUSBAR

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

-    SetStatusText("Welcome to wxWindows font demo!");
+    SetStatusText(wxT("Welcome to wxWidgets font demo!"));
+#endif // wxUSE_STATUSBAR

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


@@ -273,10 +426,10 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
                                 const wxString& encoding)
     {
         wxString text;

-        text.Printf("Encoding %d: %s (available in facename '%s')\n",
-                    ++m_n, encoding.c_str(), facename.c_str());
+        text.Printf(wxT("Encoding %u: %s (available in facename '%s')\n"),
+                    (unsigned int) ++m_n, encoding.c_str(), facename.c_str());

         m_text += text;
         m_text += text;

-        return TRUE;
+        return true;

     }
 
 private:
     }
 
 private:


@@ -290,7 +443,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());
 }
 


@@ -309,7 +462,7 @@ protected:
     virtual bool OnFacename(const wxString& facename)
     {
         m_facenames.Add(facename);
     virtual bool OnFacename(const wxString& facename)
     {
         m_facenames.Add(facename);

-        return TRUE;
+        return true;

     }
 
     private:
     }
 
     private:


@@ -329,11 +482,12 @@ 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;

+

         if ( silent )
         {
             // choose the first
         if ( silent )
         {
             // choose the first


@@ -347,8 +501,14 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
             for ( n = 0; n < nFacenames; n++ )
                 facenames[n] = fontEnumerator.GetFacenames().Item(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
+                (
+                    wxT("Choose a facename"),
+                    SAMPLE_TITLE,
+                    nFacenames,
+                    facenames,
+                    this
+                );

 
             if ( n != -1 )
                 facename = facenames[n];
 
             if ( n != -1 )
                 facename = facenames[n];


@@ -356,111 +516,330 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
             delete [] facenames;
         }
 
             delete [] facenames;
         }
 

-        if ( !facename.IsEmpty() )
+        if ( !facename.empty() )

         {
         {

-            wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
-                        wxFONTWEIGHT_NORMAL, FALSE, facename, encoding);
+            wxFont font(wxFontInfo().FaceName(facename).Encoding(encoding));

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

-        return TRUE;
+        return true;

     }
     else if ( !silent )
     {
     }
     else if ( !silent )
     {

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

     }
 
     }
 

-    return FALSE;
+    return false;

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

-    static wxFontEncoding encodings[] =
+    wxFontEncoding enc = GetEncodingFromUser();
+    if ( enc != wxFONTENCODING_SYSTEM )

     {
     {

-        wxFONTENCODING_ISO8859_1,
-        wxFONTENCODING_ISO8859_2,
-        wxFONTENCODING_ISO8859_5,
-        wxFONTENCODING_ISO8859_7,
-        wxFONTENCODING_ISO8859_15,
-        wxFONTENCODING_KOI8,
-        wxFONTENCODING_CP1250,
-        wxFONTENCODING_CP1251,
-        wxFONTENCODING_CP1252,
-    };
-
-    static const wxString encodingNames[] =
+        DoEnumerateFamilies(false, enc);
+    }
+}
+
+void MyFrame::OnSetNativeDesc(wxCommandEvent& WXUNUSED(event))
+{
+    wxString fontInfo = wxGetTextFromUser
+                        (
+                            wxT("Enter native font string"),
+                            wxT("Input font description"),
+                            m_canvas->GetTextFont().GetNativeFontInfoDesc(),
+                            this
+                        );
+    if ( fontInfo.empty() )
+        return;     // user clicked "Cancel" - do nothing
+
+    wxFont font;
+    font.SetNativeFontInfo(fontInfo);
+    if ( !font.IsOk() )
+    {
+        wxLogError(wxT("Font info string \"%s\" is invalid."),
+                   fontInfo.c_str());
+        return;
+    }
+
+    DoChangeFont(font);
+}
+
+void MyFrame::OnSetNativeUserDesc(wxCommandEvent& WXUNUSED(event))
+{
+    wxString fontdesc = GetCanvas()->GetTextFont().GetNativeFontInfoUserDesc();
+    wxString fontUserInfo = wxGetTextFromUser(
+            wxT("Here you can edit current font description"),
+            wxT("Input font description"), fontdesc,
+            this);
+    if (fontUserInfo.IsEmpty())
+        return;     // user clicked "Cancel" - do nothing
+
+    wxFont font;
+    if (font.SetNativeFontInfoUserDesc(fontUserInfo))

     {
     {

-        "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",
-        "Windows Central European (CP 1250)",
-        "Windows Cyrillic (CP 1251)",
-        "Windows Western European (CP 1252)",
-    };
-
-    int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
-                                   WXSIZEOF(encodingNames),
-                                   encodingNames,
-                                   this);
-
-    if ( n != -1 )
+        wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid"));
+        DoChangeFont(font);
+    }
+    else

     {
     {

-        DoEnumerateFamilies(FALSE, encodings[n]);
+        wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid"));
+        wxMessageBox(wxT("Error trying to create a font with such description..."));

     }
 }
 
     }
 }
 

-void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnSetFamily(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();
+    wxFontFamily f = GetFamilyFromUser();
+
+    wxFont font = m_canvas->GetTextFont();
+    font.SetFamily(f);
+    DoChangeFont(font);
+}

 
 

-    if ( fontInfo.IsEmpty() )
+void MyFrame::OnSetFaceName(wxCommandEvent& WXUNUSED(event))
+{
+    wxString facename = GetCanvas()->GetTextFont().GetFaceName();
+    wxString newFaceName = wxGetTextFromUser(
+            wxT("Here you can edit current font face name."),
+            wxT("Input font facename"), facename,
+            this);
+    if (newFaceName.IsEmpty())
+        return;     // user clicked "Cancel" - do nothing
+
+    wxFont font(GetCanvas()->GetTextFont());
+    if (font.SetFaceName(newFaceName))      // change facename only

     {
     {

-        wxLogError("Native font info string is empty!");
+        wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid"));
+        DoChangeFont(font);

     }
     else
     {
     }
     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;
-     }
+        wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid"));
+        wxMessageBox(wxT("There is no font with such face name..."),
+                     wxT("Invalid face name"), wxOK|wxICON_ERROR, this);
+    }
+}
+
+void MyFrame::OnSetEncoding(wxCommandEvent& WXUNUSED(event))
+{
+    wxFontEncoding enc = GetEncodingFromUser();
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return;
+
+    wxFont font = m_canvas->GetTextFont();
+    font.SetEncoding(enc);
+    DoChangeFont(font);
+}
+
+wxFontEncoding MyFrame::GetEncodingFromUser()
+{
+    wxArrayString names;
+    wxArrayInt encodings;
+
+    const size_t count = wxFontMapper::GetSupportedEncodingsCount();
+    names.reserve(count);
+    encodings.reserve(count);
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxFontEncoding enc = wxFontMapper::GetEncoding(n);
+        encodings.push_back(enc);
+        names.push_back(wxFontMapper::GetEncodingName(enc));
+    }
+
+    int i = wxGetSingleChoiceIndex
+            (
+                wxT("Choose the encoding"),
+                SAMPLE_TITLE,
+                names,
+                this
+            );
+
+    return i == -1 ? wxFONTENCODING_SYSTEM : (wxFontEncoding)encodings[i];
+}
+
+wxFontFamily MyFrame::GetFamilyFromUser()
+{
+    wxArrayString names;
+    wxArrayInt families;
+
+    families.push_back(wxFONTFAMILY_DECORATIVE);
+    families.push_back(wxFONTFAMILY_ROMAN);
+    families.push_back(wxFONTFAMILY_SCRIPT);
+    families.push_back(wxFONTFAMILY_SWISS);
+    families.push_back(wxFONTFAMILY_MODERN);
+    families.push_back(wxFONTFAMILY_TELETYPE);
+
+    names.push_back("DECORATIVE");
+    names.push_back("ROMAN");
+    names.push_back("SCRIPT");
+    names.push_back("SWISS");
+    names.push_back("MODERN");
+    names.push_back("TELETYPE");
+
+    int i = wxGetSingleChoiceIndex
+            (
+                wxT("Choose the family"),
+                SAMPLE_TITLE,
+                names,
+                this
+            );
+
+    return i == -1 ? wxFONTFAMILY_DEFAULT : (wxFontFamily)families[i];

 }
 
 void MyFrame::DoResizeFont(int diff)
 {
 }
 
 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::OnLight(wxCommandEvent& event)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetWeight(event.IsChecked() ? wxFONTWEIGHT_LIGHT : wxFONTWEIGHT_NORMAL);
+    DoChangeFont(font);
+}
+
+void MyFrame::OnItalic(wxCommandEvent& event)

 {
 {

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

 
 

+    font.SetStyle(event.IsChecked() ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL);
+    DoChangeFont(font);
+}
+
+void MyFrame::OnSlant(wxCommandEvent& event)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetStyle(event.IsChecked() ? wxFONTSTYLE_SLANT : wxFONTSTYLE_NORMAL);
+    DoChangeFont(font);
+}
+
+void MyFrame::OnUnderline(wxCommandEvent& event)
+{
+    wxFont font = m_canvas->GetTextFont();
+
+    font.SetUnderlined(event.IsChecked());
+    DoChangeFont(font);
+}
+
+void MyFrame::OnStrikethrough(wxCommandEvent& event)
+{
+    wxFont font = m_canvas->GetTextFont();
+    font.SetStrikethrough(event.IsChecked());
+    DoChangeFont(font);
+}
+
+void MyFrame::OnwxPointerFont(wxCommandEvent& event)
+{
+    wxFont font;
+
+    switch ( event.GetId() )
+    {
+        case Font_wxNORMAL_FONT:
+            font = *wxNORMAL_FONT;
+            break;
+
+        case Font_wxSMALL_FONT:
+            font = *wxSMALL_FONT;
+            break;
+
+        case Font_wxITALIC_FONT:
+            font = *wxITALIC_FONT;
+            break;
+
+        case Font_wxSWISS_FONT:
+            font = *wxSWISS_FONT;
+            break;
+
+        default:
+            wxFAIL_MSG( wxT("unknown standard font") );
+            return;
+    }
+
+    DoChangeFont(font);
+}
+
+void MyFrame::OnwxSystemSettingsFont(wxCommandEvent& event)
+{
+    wxFont font;
+
+    switch ( event.GetId() )
+    {
+        case Font_wxSYS_OEM_FIXED_FONT:
+            font = wxSystemSettings::GetFont(wxSYS_OEM_FIXED_FONT);
+            break;
+
+        case Font_wxSYS_ANSI_FIXED_FONT:
+            font = wxSystemSettings::GetFont(wxSYS_ANSI_FIXED_FONT);
+            break;
+
+        case Font_wxSYS_ANSI_VAR_FONT:
+            font = wxSystemSettings::GetFont(wxSYS_ANSI_VAR_FONT);
+            break;
+
+        case Font_wxSYS_SYSTEM_FONT:
+            font = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT);
+            break;
+
+        case Font_wxSYS_DEVICE_DEFAULT_FONT:
+            font = wxSystemSettings::GetFont(wxSYS_DEVICE_DEFAULT_FONT);
+            break;
+
+        case Font_wxSYS_DEFAULT_GUI_FONT:
+            font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+            break;
+
+        default:
+            wxFAIL_MSG( wxT("unknown standard font") );
+            return;
+    }
+
+    DoChangeFont(font);
+}
+
+void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
+{

     m_canvas->SetTextFont(font);
     m_canvas->SetTextFont(font);

-    if ( col.Ok() )
+    if ( col.IsOk() )

         m_canvas->SetColour(col);
     m_canvas->Refresh();
 
     m_textctrl->SetFont(font);
         m_canvas->SetColour(col);
     m_canvas->Refresh();
 
     m_textctrl->SetFont(font);

-    if ( col.Ok() )
+    if ( col.IsOk() )

         m_textctrl->SetForegroundColour(col);
         m_textctrl->SetForegroundColour(col);

+    m_textctrl->Refresh();
+
+    // update the state of the bold/italic/underlined menu items
+    wxMenuBar *mbar = GetMenuBar();
+    if ( mbar )
+    {
+        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());
+        mbar->Check(Font_Strikethrough, font.GetStrikethrough());
+    }

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


@@ -469,7 +848,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();


@@ -482,15 +861,26 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
+}
+
+void MyFrame::OnTestTextValue(wxCommandEvent& WXUNUSED(event))
+{
+    wxString value = m_textctrl->GetValue();
+    m_textctrl->SetValue(value);
+    if ( m_textctrl->GetValue() != value )
+    {
+        wxLogError(wxT("Text value changed after getting and setting it"));
+    }

 }
 
 void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     // first, choose the file
     static wxString s_dir, s_file;
     // first, choose the file
     static wxString s_dir, s_file;

-    wxFileDialog dialog(this, "Open an email message file",
+    wxFileDialog dialog(this, wxT("Open an email message file"),

                         s_dir, s_file);
     if ( dialog.ShowModal() != wxID_OK )
         return;
                         s_dir, s_file);
     if ( dialog.ShowModal() != wxID_OK )
         return;


@@ -508,8 +898,8 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
     wxString charset;
 
 
     wxString charset;
 

-    static const char *prefix = "Content-Type: text/plain; charset=";
-    const size_t len = strlen(prefix);
+    static const wxChar *prefix = wxT("Content-Type: text/plain; charset=");
+    const size_t len = wxStrlen(prefix);

 
     size_t n, count = file.GetLineCount();
     for ( n = 0; n < count; n++ )
 
     size_t n, count = file.GetLineCount();
     for ( n = 0; n < count; n++ )


@@ -526,11 +916,11 @@ 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;
-            if ( *pc == '"' )
+            const wxChar *pc = line.c_str() + len;
+            if ( *pc == wxT('"') )

                 pc++;
 
                 pc++;
 

-            while ( *pc && *pc != '"' )
+            while ( *pc && *pc != wxT('"') )

             {
                 charset += *pc++;
             }
             {
                 charset += *pc++;
             }


@@ -541,28 +931,28 @@ 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;
     }
 
     // ok, now get the corresponding encoding
                    filename.c_str());
 
         return;
     }
 
     // ok, now get the corresponding encoding

-    wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset);
+    wxFontEncoding fontenc = wxFontMapper::Get()->CharsetToEncoding(charset);

     if ( fontenc == wxFONTENCODING_SYSTEM )
     {
     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);
 
     if ( fontenc == wxFONTENCODING_UTF8 ||
         return;
     }
 
     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;
 


@@ -573,71 +963,41 @@ 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());
     }
 
     // and now create the correct font
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
     }
 
     // and now create the correct font

-    if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) )
+    if ( !DoEnumerateFamilies(false, fontenc, true /* silent */) )

     {
     {

-        wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
-                    wxFONTWEIGHT_NORMAL, FALSE /* !underlined */,
-                    wxEmptyString /* facename */, fontenc);
-        if ( font.Ok() )
+        wxFont font(wxFontInfo(wxNORMAL_FONT->GetPointSize()).Encoding(fontenc));
+        if ( font.IsOk() )

         {
             DoChangeFont(font);
         }
         else
         {
         {
             DoChangeFont(font);
         }
         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());
         }
     }

+#endif // wxUSE_FILEDLG

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox("wxWindows font demo\n"
-                 "(c) 1999 Vadim Zeitlin",
-                 "About Font",
+    wxMessageBox(wxT("wxWidgets font sample\n")
+                 wxT("(c) 1999-2006 Vadim Zeitlin"),
+                 wxString(wxT("About ")) + SAMPLE_TITLE,

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


@@ -647,79 +1007,113 @@ BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )

-        : wxWindow( parent, -1 ),
+        : wxWindow( parent, wxID_ANY ),

           m_colour(*wxRED), m_font(*wxNORMAL_FONT)
 {
 }
 
           m_colour(*wxRED), m_font(*wxNORMAL_FONT)
 {
 }
 

-MyCanvas::~MyCanvas()
-{
-}
-

 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 
     // set background
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
 
     // set background

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

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

+    dc.SetFont(m_font);
+
+    // 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("Face name: %s, family: %s"),
+                    m_font.GetFaceName().c_str(),
+                    m_font.GetFamilyString().c_str());
+
+    dc.DrawText(fontInfo, x, y);
+    y += hLine;
+
+    fontInfo.Printf(wxT("Size: %d points or %d pixels; %d*%d average char size"),

                     m_font.GetPointSize(),
                     m_font.GetPointSize(),

-                    m_font.GetFamilyString().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, encoding: %s"),

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

-                    m_font.GetWeightString().c_str());
+                    m_font.GetWeightString().c_str(),
+                    m_font.IsFixedWidth() ? wxT("yes") : wxT("no"),
+                    wxFontMapper::GetEncodingDescription(m_font.GetEncoding()));

 
 

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

 
 

-    if ( m_font.Ok() )
+    if ( m_font.IsOk() )

     {
     {

-        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());
+        const wxNativeFontInfo *info = m_font.GetNativeFontInfo();
+        if ( 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
     // prepare to draw the font

-    dc.SetFont(m_font);

     dc.SetTextForeground(m_colour);
 
     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)
+    wxCoord 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 = (wxChar)(32 * (i + 1) + j);
+
+            wxCoord charWidth, charHeight;
+            dc.GetTextExtent(c, &charWidth, &charHeight);
+            dc.DrawText
+            (
+                c,
+                x + w*j + (maxCharWidth - charWidth) / 2 + 1,
+                y + h*i + (maxCharHeight - charHeight) / 2
+            );

         }
     }
 
     // draw the lines between them
         }
     }
 
     // draw the lines between them

-    dc.SetPen(wxPen(wxColour("blue"), 1, wxSOLID));
+    dc.SetPen(*wxBLUE_PEN);

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

     }
 }
     }
 }