Updating OpenVMS compile configuration

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 047299d82aaf3a83a198fc2bc6e88dbf4c529875..f6c8d5f32da259cc18d25ab49f907928ec2d3992 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -17,7 +17,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #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
     #include "wx/wx.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 


@@ -32,6 +32,16 @@
 #include "wx/splitter.h"
 #include "wx/textfile.h"
 
 #include "wx/splitter.h"
 #include "wx/textfile.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[] = _T("wxWidgets Font Sample");
+

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


@@ -54,7 +64,7 @@ class MyCanvas: public wxWindow
 {
 public:
     MyCanvas( wxWindow *parent );
 {
 public:
     MyCanvas( wxWindow *parent );

-    virtual ~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; }


@@ -86,8 +96,8 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     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 OnItalic(wxCommandEvent& event);
 
     void OnBold(wxCommandEvent& event);
     void OnItalic(wxCommandEvent& event);


@@ -95,32 +105,41 @@ public:
 
     void OnwxPointerFont(wxCommandEvent& event);
 
 
     void OnwxPointerFont(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 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);
 

+    // ask the user to choose an encoding and return it or
+    // wxFONTENCODING_SYSTEM if the dialog was cancelled
+    wxFontEncoding GetEncodingFromUser();
+
+

     size_t      m_fontSize; // in points
 
     wxTextCtrl *m_textctrl;
     MyCanvas   *m_canvas;
 
 private:
     size_t      m_fontSize; // in points
 
     wxTextCtrl *m_textctrl;
     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()
 };
 


@@ -135,6 +154,8 @@ enum
     Font_Quit = 1,
     Font_About,
     Font_ViewMsg,
     Font_Quit = 1,
     Font_About,
     Font_ViewMsg,

+    Font_TestTextValue,
+

     Font_IncSize,
     Font_DecSize,
     Font_Bold,
     Font_IncSize,
     Font_DecSize,
     Font_Bold,


@@ -151,19 +172,23 @@ enum
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,

-    Font_CheckNativeToFromString,
+    Font_SetNativeDesc,
+    Font_SetNativeUserDesc,
+    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_ViewMsg, MyFrame::OnViewMsg)
     EVT_MENU(Font_About, MyFrame::OnAbout)
 


@@ -178,7 +203,11 @@ 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_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
+
+    EVT_MENU(Font_SetNativeDesc, MyFrame::OnSetNativeDesc)
+    EVT_MENU(Font_SetNativeUserDesc, MyFrame::OnSetNativeUserDesc)
+    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)


@@ -187,7 +216,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)
 END_EVENT_TABLE()
 
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)
 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


@@ -205,18 +234,21 @@ 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(wxT("Font wxWindows demo"),
+    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
                                  wxPoint(50, 50), wxSize(600, 400));
 
     // Show it and tell the application that it's our main window

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

     SetTopWindow(frame);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     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
+    // loop and the application will run. If we returned 'false' here, the

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

-    return TRUE;
+    return true;

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


@@ -225,13 +257,17 @@ 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_xpm));

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


@@ -243,24 +279,28 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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->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->Append(Font_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state"), TRUE);
-    menuFont->Append(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state"), TRUE);
-    menuFont->Append(Font_Underlined, wxT("&Underlined\tCtrl-U"),
-                     wxT("Toggle underlined state"), TRUE);
+    menuFont->AppendCheckItem(Font_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state"));
+    menuFont->AppendCheckItem(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state"));
+    menuFont->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"),
+                     wxT("Toggle underlined state"));

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

-    menuFont->Append(Font_CheckNativeToFromString,
-                     wxT("Check Native Font Info To/From String"));
+    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->Append(Font_SetFaceName, wxT("Check 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;
 
     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 wxWindows"));
-    menuStdFonts->Append(Font_wxSMALL_FONT,  wxT("wxSMALL_FONT"),  wxT("Small font used by wxWindows"));
-    menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWindows"));
-    menuStdFonts->Append(Font_wxSWISS_FONT,  wxT("wxSWISS_FONT"),  wxT("Swiss font used by wxWindows"));
+    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);
 
     menuSelect->AppendSeparator();
     menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts);
 
     menuSelect->AppendSeparator();


@@ -284,7 +324,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     wxSplitterWindow *splitter = new wxSplitterWindow(this);
 
 
     wxSplitterWindow *splitter = new wxSplitterWindow(this);
 

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


@@ -293,9 +333,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     splitter->SplitHorizontally(m_textctrl, m_canvas, 100);
 
 
     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(wxT("Welcome to wxWindows font demo!"));
+    SetStatusText(wxT("Welcome to wxWidgets font demo!"));
+#endif // wxUSE_STATUSBAR

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


@@ -314,10 +356,10 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
                                 const wxString& encoding)
     {
         wxString text;

-        text.Printf(wxT("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:


@@ -350,7 +392,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:


@@ -375,6 +417,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
         }
 
         wxString facename;
         }
 
         wxString facename;

+

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


@@ -388,8 +431,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];


@@ -397,81 +446,141 @@ 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(wxNORMAL_FONT->GetPointSize(),
+                        wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                        wxFONTWEIGHT_NORMAL, false, facename, encoding);

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

-        return TRUE;
+        return true;

     }
     else if ( !silent )
     {
         wxLogWarning(wxT("No such fonts found."));
     }
 
     }
     else if ( !silent )
     {
         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.Ok() )

     {
     {

-        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("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 )
+        wxLogError(wxT("Font info string \"%s\" is invalid."),
+                   fontInfo.c_str());
+        return;
+    }
+
+    DoChangeFont(font);
+}
+
+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

     {
     {

-        DoEnumerateFamilies(FALSE, encodings[n]);
+        wxASSERT_MSG(font.Ok(), wxT("The font should now be valid"));
+        DoChangeFont(font);

     }
     }

+    else
+    {
+        wxASSERT_MSG(!font.Ok(), 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::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.IsEmpty() )
+    wxFont font;
+    if (font.SetNativeFontInfoUserDesc(fontUserInfo))

     {
     {

-        wxLogError(wxT("Native font info string is empty!"));
+        wxASSERT_MSG(font.Ok(), 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.Ok(), wxT("The font should now be invalid"));
+        wxMessageBox(wxT("Error trying to create a font with such description..."));
+    }
+}
+
+void MyFrame::OnSetEncoding(wxCommandEvent& WXUNUSED(event))
+{
+    wxFontEncoding enc = GetEncodingFromUser();
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return;

 
 

-        delete font;
-     }
+    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];

 }
 
 void MyFrame::DoResizeFont(int diff)
 }
 
 void MyFrame::DoResizeFont(int diff)


@@ -510,18 +619,28 @@ 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;

 
 

-    GetMenuBar()->Check(Font_Bold, FALSE);
-    GetMenuBar()->Check(Font_Italic, FALSE);
-    GetMenuBar()->Check(Font_Underlined, FALSE);
+        case Font_wxSWISS_FONT:
+            font = *wxSWISS_FONT;
+            break;
+
+        default:
+            wxFAIL_MSG( wxT("unknown standard font") );
+            return;
+    }

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


@@ -536,6 +655,15 @@ void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
     m_textctrl->SetFont(font);
     if ( col.Ok() )
         m_textctrl->SetForegroundColour(col);
     m_textctrl->SetFont(font);
     if ( col.Ok() )
         m_textctrl->SetForegroundColour(col);

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

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


@@ -552,26 +680,28 @@ 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());
-        }

     }
 }
 
 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;
     wxFileDialog dialog(this, wxT("Open an email message file"),
     // first, choose the file
     static wxString s_dir, s_file;
     wxFileDialog dialog(this, wxT("Open an email message file"),


@@ -668,10 +798,11 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     }
 
     // and now create the correct font
     }
 
     // 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 */,
+        wxFont font(wxNORMAL_FONT->GetPointSize(),
+                    wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                    wxFONTWEIGHT_NORMAL, false /* !underlined */,

                     wxEmptyString /* facename */, fontenc);
         if ( font.Ok() )
         {
                     wxEmptyString /* facename */, fontenc);
         if ( font.Ok() )
         {


@@ -683,13 +814,14 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
                          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(wxT("wxWindows 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);
 }
 


@@ -702,15 +834,11 @@ 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);
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc(this);


@@ -732,7 +860,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),
     fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),

-                    wxFontMapper::Get()->
+                    wxFontMapper::

                         GetEncodingDescription(m_font.GetEncoding()).c_str());
 
     dc.DrawText(fontInfo, x, y);
                         GetEncodingDescription(m_font.GetEncoding()).c_str());
 
     dc.DrawText(fontInfo, x, y);


@@ -766,7 +894,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     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;


@@ -777,9 +905,9 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         for ( int j = 0; j < 32; j++ )
         {
     {
         for ( int j = 0; j < 32; j++ )
         {

-            wxChar c = 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
             (