Add CombineURIs implementation for wxWebFileProtocolHandler. Update the IE backend...

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 7fe8717618c9950c58bbe08d9b7585c3a93ade9a..fce11afd27c8e86d8bea7467e169ea62b4152281 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -31,14 +31,18 @@
 #include "wx/encconv.h"
 #include "wx/splitter.h"
 #include "wx/textfile.h"
 #include "wx/encconv.h"
 #include "wx/splitter.h"
 #include "wx/textfile.h"

+#include "wx/settings.h"

 
 #include "../sample.xpm"
 
 #ifdef __WXMAC__
 
 #include "../sample.xpm"
 
 #ifdef __WXMAC__

-#undef wxFontDialog
-#include "wx/mac/fontdlg.h"
+    #undef wxFontDialog
+    #include "wx/osx/fontdlg.h"

 #endif
 
 #endif
 

+// used as title for several dialog boxes
+static const wxChar SAMPLE_TITLE[] = wxT("wxWidgets Font Sample");
+

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


@@ -97,11 +101,17 @@ public:
     void OnDecFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(-2); }
 
     void OnBold(wxCommandEvent& event);
     void OnDecFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(-2); }
 
     void OnBold(wxCommandEvent& event);

+    void OnLight(wxCommandEvent& event);
+

     void OnItalic(wxCommandEvent& event);
     void OnItalic(wxCommandEvent& event);

+    void OnSlant(wxCommandEvent& event);
+

     void OnUnderline(wxCommandEvent& event);
 
     void OnwxPointerFont(wxCommandEvent& event);
     void OnUnderline(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 OnViewMsg(wxCommandEvent& event);
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);


@@ -111,9 +121,12 @@ public:
         { DoEnumerateFamilies(true); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 
         { DoEnumerateFamilies(true); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 

-    void OnCheckNativeToFromString(wxCommandEvent& event);
-    void OnCheckNativeToFromUserString(wxCommandEvent& event);
-    void OnCheckFaceName(wxCommandEvent& event);
+    void OnSetNativeDesc(wxCommandEvent& event);
+    void OnSetNativeUserDesc(wxCommandEvent& event);
+
+    void OnSetFamily(wxCommandEvent& event);
+    void OnSetFaceName(wxCommandEvent& event);
+    void OnSetEncoding(wxCommandEvent& event);

 
 protected:
     bool DoEnumerateFamilies(bool fixedWidthOnly,
 
 protected:
     bool DoEnumerateFamilies(bool fixedWidthOnly,


@@ -123,6 +136,14 @@ 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);
 

+    // 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
 
     wxTextCtrl *m_textctrl;
     size_t      m_fontSize; // in points
 
     wxTextCtrl *m_textctrl;


@@ -141,28 +162,49 @@ 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_Bold,

+    Font_Light,
+

     Font_Italic,
     Font_Italic,

+    Font_Slant,
+

     Font_Underlined,
     Font_Underlined,

+
+    // standard global wxFont objects:

     Font_wxNORMAL_FONT,
     Font_wxSMALL_FONT,
     Font_wxITALIC_FONT,
     Font_wxSWISS_FONT,
     Font_Standard,
 
     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_CheckNativeToFromUserString,
-    Font_CheckFaceName,
+    Font_SetNativeDesc,
+    Font_SetNativeUserDesc,
+    Font_SetFamily,
+    Font_SetFaceName,
+    Font_SetEncoding,

     Font_Max
 };
 
     Font_Max
 };
 


@@ -175,13 +217,19 @@ 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_TestTextValue, MyFrame::OnTestTextValue)

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

+

     EVT_MENU(Font_Bold, MyFrame::OnBold)
     EVT_MENU(Font_Bold, MyFrame::OnBold)

+    EVT_MENU(Font_Light, MyFrame::OnLight)
+

     EVT_MENU(Font_Italic, MyFrame::OnItalic)
     EVT_MENU(Font_Italic, MyFrame::OnItalic)

+    EVT_MENU(Font_Slant, MyFrame::OnSlant)
+

     EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
 
     EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont)
     EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
 
     EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont)


@@ -189,10 +237,18 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_wxITALIC_FONT, MyFrame::OnwxPointerFont)
     EVT_MENU(Font_wxSWISS_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_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
-    EVT_MENU(Font_CheckNativeToFromUserString, MyFrame::OnCheckNativeToFromUserString)
-    EVT_MENU(Font_CheckFaceName, MyFrame::OnCheckFaceName)
+    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_Choose, MyFrame::OnSelectFont)
     EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding)


@@ -219,13 +275,15 @@ 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
     MyFrame *frame = new MyFrame(wxT("Font wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(600, 400));
 
     // Create the main application window
     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
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned 'false' here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned 'false' here, the


@@ -241,13 +299,15 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), m_textctrl(NULL)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), m_textctrl(NULL)
 {

-    m_fontSize = 12;
+    m_fontSize = wxNORMAL_FONT->GetPointSize();

 
 

-    SetIcon(wxIcon(sample_xpm));
+    SetIcon(wxICON(sample));

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

+    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->Append(Font_ViewMsg, wxT("&View...\tCtrl-V"),
                      wxT("View an email message file"));
     menuFile->AppendSeparator();


@@ -260,21 +320,30 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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->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"));
     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->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"),
     menuFont->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"),

-                     wxT("Toggle underlined state"));
+                              wxT("Toggle underlined state"));

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

-    menuFont->Append(Font_CheckNativeToFromString,
-                     wxT("Check Native Font Info To/From String"));
-    menuFont->Append(Font_CheckNativeToFromUserString,
-                     wxT("Check Native Font Info User String"));
-    menuFont->Append(Font_CheckFaceName,
-                     wxT("Check font face name"));                     
+    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->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"),
 
     wxMenu *menuSelect = new wxMenu;
     menuSelect->Append(Font_Choose, wxT("&Select font...\tCtrl-S"),

-                     wxT("Select a standard font"));
+                       wxT("Select a standard font"));

 
     wxMenu *menuStdFonts = new wxMenu;
     menuStdFonts->Append(Font_wxNORMAL_FONT, wxT("wxNORMAL_FONT"), wxT("Normal font used by wxWidgets"));
 
     wxMenu *menuStdFonts = new wxMenu;
     menuStdFonts->Append(Font_wxNORMAL_FONT, wxT("wxNORMAL_FONT"), wxT("Normal font used by wxWidgets"));


@@ -283,6 +352,22 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuStdFonts->Append(Font_wxSWISS_FONT,  wxT("wxSWISS_FONT"),  wxT("Swiss font used by wxWidgets"));
     menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts);
 
     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,
     menuSelect->AppendSeparator();
     menuSelect->Append(Font_EnumFamilies, wxT("Enumerate font &families\tCtrl-F"));
     menuSelect->Append(Font_EnumFixedFamilies,


@@ -411,8 +496,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(wxT("Choose a facename"), wxT("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];


@@ -422,7 +513,8 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
 
         if ( !facename.empty() )
         {
 
         if ( !facename.empty() )
         {

-            wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+            wxFont font(wxNORMAL_FONT->GetPointSize(),
+                        wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,

                         wxFONTWEIGHT_NORMAL, false, facename, encoding);
 
             DoChangeFont(font);
                         wxFONTWEIGHT_NORMAL, false, facename, encoding);
 
             DoChangeFont(font);


@@ -440,66 +532,70 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
 
 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_KOI8_U,
-        wxFONTENCODING_CP1250,
-        wxFONTENCODING_CP1251,
-        wxFONTENCODING_CP1252,
-    };
-
-    static const wxString encodingNames[] =
-    {
-        wxT("Western European (ISO-8859-1)"),
-        wxT("Central European (ISO-8859-2)"),
-        wxT("Cyrillic (ISO-8859-5)"),
-        wxT("Greek (ISO-8859-7)"),
-        wxT("Western European with Euro (ISO-8859-15)"),
-        wxT("KOI8-R"),
-        wxT("KOI8-U"),
-        wxT("Windows Central European (CP 1250)"),
-        wxT("Windows Cyrillic (CP 1251)"),
-        wxT("Windows Western European (CP 1252)"),
-    };
-
-    int n = wxGetSingleChoiceIndex(wxT("Choose an encoding"), wxT("Font demo"),
-                                   WXSIZEOF(encodingNames),
-                                   encodingNames,
-                                   this);
-
-    if ( n != -1 )
+        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() )

     {
     {

-        DoEnumerateFamilies(false, encodings[n]);
+        wxLogError(wxT("Font info string \"%s\" is invalid."),
+                   fontInfo.c_str());
+        return;

     }
     }

+
+    DoChangeFont(font);

 }
 
 }
 

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

 {
 {

-    wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();
+    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

 
 

-    if ( fontInfo.empty() )
+    wxFont font;
+    if (font.SetNativeFontInfoUserDesc(fontUserInfo))

     {
     {

-        wxLogError(wxT("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(wxT("wxNativeFontInfo ToString()/FromString() broken!"));
-        else
-            wxLogMessage(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str());
+        wxASSERT_MSG(!font.IsOk(), wxT("The font should now be invalid"));
+        wxMessageBox(wxT("Error trying to create a font with such description..."));
+    }
+}

 
 

-        delete font;
-     }
+void MyFrame::OnSetFamily(wxCommandEvent& WXUNUSED(event))
+{
+    wxFontFamily f = GetFamilyFromUser();
+
+    wxFont font = m_canvas->GetTextFont();
+    font.SetFamily(f);
+    DoChangeFont(font);

 }
 
 }
 

-void MyFrame::OnCheckFaceName(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnSetFaceName(wxCommandEvent& WXUNUSED(event))

 {
     wxString facename = GetCanvas()->GetTextFont().GetFaceName();
     wxString newFaceName = wxGetTextFromUser(
 {
     wxString facename = GetCanvas()->GetTextFont().GetFaceName();
     wxString newFaceName = wxGetTextFromUser(


@@ -512,38 +608,83 @@ void MyFrame::OnCheckFaceName(wxCommandEvent& WXUNUSED(event))
     wxFont font(GetCanvas()->GetTextFont());
     if (font.SetFaceName(newFaceName))      // change facename only
     {
     wxFont font(GetCanvas()->GetTextFont());
     if (font.SetFaceName(newFaceName))      // change facename only
     {

-        wxASSERT_MSG(font.Ok(), wxT("The font should now be valid"));
+        wxASSERT_MSG(font.IsOk(), wxT("The font should now be valid"));

         DoChangeFont(font);
     }
     else
     {
         DoChangeFont(font);
     }
     else
     {

-        wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid"));
+        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);
         wxMessageBox(wxT("There is no font with such face name..."),
                      wxT("Invalid face name"), wxOK|wxICON_ERROR, this);

-    }    
+    }

 }
 
 }
 

-void MyFrame::OnCheckNativeToFromUserString(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnSetEncoding(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
+    wxFontEncoding enc = GetEncodingFromUser();
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return;

 
 

-    wxFont font;
-    if (font.SetNativeFontInfoUserDesc(fontUserInfo))
-    {
-        wxASSERT_MSG(font.Ok(), wxT("The font should now be valid"));
-        DoChangeFont(font);
-    }
-    else
+    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++ )

     {
     {

-        wxASSERT_MSG(!font.Ok(), wxT("The font should now be invalid"));
-        wxMessageBox(wxT("Error trying to create a font with such description..."));
+        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)


@@ -562,6 +703,14 @@ void MyFrame::OnBold(wxCommandEvent& event)
     DoChangeFont(font);
 }
 
     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)
 {
     wxFont font = m_canvas->GetTextFont();
 void MyFrame::OnItalic(wxCommandEvent& event)
 {
     wxFont font = m_canvas->GetTextFont();


@@ -570,6 +719,14 @@ void MyFrame::OnItalic(wxCommandEvent& event)
     DoChangeFont(font);
 }
 
     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();
 void MyFrame::OnUnderline(wxCommandEvent& event)
 {
     wxFont font = m_canvas->GetTextFont();


@@ -582,13 +739,65 @@ void MyFrame::OnwxPointerFont(wxCommandEvent& event)
 {
     wxFont font;
 
 {
     wxFont font;
 

-    switch (event.GetId())
+    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;
+        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);
     }
 
     DoChangeFont(font);


@@ -597,20 +806,26 @@ void MyFrame::OnwxPointerFont(wxCommandEvent& event)
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
     m_canvas->SetTextFont(font);
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
     m_canvas->SetTextFont(font);

-    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);
 
     // update the state of the bold/italic/underlined menu items
     wxMenuBar *mbar = GetMenuBar();
     if ( mbar )
     {
         m_textctrl->SetForegroundColour(col);
 
     // 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_Bold, font.GetWeight() == wxFONTWEIGHT_BOLD);

+

         mbar->Check(Font_Italic, font.GetStyle() == wxFONTSTYLE_ITALIC);
         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_Underlined, font.GetUnderlined());
     }
 }


@@ -638,6 +853,16 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
     Close(true);
 }
 
     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))
 {
 #if wxUSE_FILEDLG
 void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_FILEDLG


@@ -739,10 +964,11 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     // and now create the correct font
     if ( !DoEnumerateFamilies(false, fontenc, true /* silent */) )
     {
     // and now create the correct font
     if ( !DoEnumerateFamilies(false, fontenc, true /* silent */) )
     {

-        wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+        wxFont font(wxNORMAL_FONT->GetPointSize(),
+                    wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,

                     wxFONTWEIGHT_NORMAL, false /* !underlined */,
                     wxEmptyString /* facename */, fontenc);
                     wxFONTWEIGHT_NORMAL, false /* !underlined */,
                     wxEmptyString /* facename */, fontenc);

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

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


@@ -757,9 +983,9 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(wxT("wxWidgets font demo\n")
-                 wxT("(c) 1999 Vadim Zeitlin"),
-                 wxT("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);
 }
 


@@ -785,6 +1011,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     // set background
     dc.SetBackground(wxBrush(wxT("white"), wxSOLID));
     dc.Clear();
     // set background
     dc.SetBackground(wxBrush(wxT("white"), wxSOLID));
     dc.Clear();

+    dc.SetFont(m_font);

 
     // one text line height
     wxCoord hLine = dc.GetCharHeight();
 
     // one text line height
     wxCoord hLine = dc.GetCharHeight();


@@ -795,24 +1022,32 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // output the font name/info
     wxString fontInfo;
 
     // output the font name/info
     wxString fontInfo;

-    fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %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(),
-                    wxFontMapper::
-                        GetEncodingDescription(m_font.GetEncoding()).c_str());
+                    m_font.GetPixelSize().y,
+                    dc.GetCharWidth(), dc.GetCharHeight());

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

-    fontInfo.Printf(wxT("Style: %s, weight: %s, fixed width: %s"),
+    fontInfo.Printf(wxT("Style: %s, weight: %s, fixed width: %s, encoding: %s"),

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

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

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

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

     {
         const wxNativeFontInfo *info = m_font.GetNativeFontInfo();
         if ( info )
     {
         const wxNativeFontInfo *info = m_font.GetNativeFontInfo();
         if ( info )


@@ -828,11 +1063,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     y += hLine;
 
     // prepare to draw the font
     y += hLine;
 
     // prepare to draw the font

-    dc.SetFont(m_font);

     dc.SetTextForeground(m_colour);
 
     // the size of one cell (Normally biggest char + small margin)
     dc.SetTextForeground(m_colour);
 
     // the size of one cell (Normally biggest char + small margin)

-    long maxCharWidth, maxCharHeight;
+    wxCoord maxCharWidth, maxCharHeight;

     dc.GetTextExtent(wxT("W"), &maxCharWidth, &maxCharHeight);
     int w = maxCharWidth + 5,
         h = maxCharHeight + 4;
     dc.GetTextExtent(wxT("W"), &maxCharWidth, &maxCharHeight);
     int w = maxCharWidth + 5,
         h = maxCharHeight + 4;


@@ -845,7 +1079,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             wxChar c = (wxChar)(32 * (i + 1) + j);
 
         {
             wxChar c = (wxChar)(32 * (i + 1) + j);
 

-            long charWidth, charHeight;
+            wxCoord charWidth, charHeight;

             dc.GetTextExtent(c, &charWidth, &charHeight);
             dc.DrawText
             (
             dc.GetTextExtent(c, &charWidth, &charHeight);
             dc.DrawText
             (


@@ -857,7 +1091,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     }
 
     // draw the lines between them
     }
 
     // draw the lines between them

-    dc.SetPen(wxPen(wxColour(_T("blue")), 1, wxSOLID));
+    dc.SetPen(wxPen(wxColour(wxT("blue")), 1, wxSOLID));

     int l;
 
     // horizontal
     int l;
 
     // horizontal