fixes potential crash under gatekeeper

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

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index ce6f36985adc9b3eeab95bae12540e30499bff86..c8cff2e88a727e6a919d8b1945850a731b7d3d98 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Julian Smart, Vadim Zeitlin
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling, Julian Smart, Vadim Zeitlin

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -43,6 +43,11 @@
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
 #include "wx/numdlg.h"
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
 #include "wx/numdlg.h"

+#include "wx/tokenzr.h"
+
+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif

 
 //----------------------------------------------------------------------
 // class definitions
 
 //----------------------------------------------------------------------
 // class definitions


@@ -71,9 +76,14 @@ public:
     void OnChar(wxKeyEvent& event);
 
     void OnText(wxCommandEvent& event);
     void OnChar(wxKeyEvent& event);
 
     void OnText(wxCommandEvent& event);

+    void OnTextEnter(wxCommandEvent& event);

     void OnTextURL(wxTextUrlEvent& event);
     void OnTextMaxLen(wxCommandEvent& event);
 
     void OnTextURL(wxTextUrlEvent& event);
     void OnTextMaxLen(wxCommandEvent& event);
 

+    void OnTextCut(wxClipboardTextEvent & event);
+    void OnTextCopy(wxClipboardTextEvent & event);
+    void OnTextPaste(wxClipboardTextEvent & event);
+

     void OnMouseEvent(wxMouseEvent& event);
 
     void OnSetFocus(wxFocusEvent& event);
     void OnMouseEvent(wxMouseEvent& event);
 
     void OnSetFocus(wxFocusEvent& event);


@@ -84,10 +94,13 @@ public:
     static bool ms_logMouse;
     static bool ms_logText;
     static bool ms_logFocus;
     static bool ms_logMouse;
     static bool ms_logText;
     static bool ms_logFocus;

+    static bool ms_logClip;

 
 private:
 
 private:

-    static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); }
+    static inline wxChar GetChar(bool on, wxChar c) { return on ? c : wxT('-'); }
+

     void LogKeyEvent(const wxChar *name, wxKeyEvent& event) const;
     void LogKeyEvent(const wxChar *name, wxKeyEvent& event) const;

+    void LogClipEvent(const wxChar *what, wxClipboardTextEvent& event);

 
     bool m_hasCapture;
 
 
     bool m_hasCapture;
 


@@ -115,6 +128,7 @@ public:
     void DoSelectText();
     void DoMoveToEndOfText();
     void DoMoveToEndOfEntry();
     void DoSelectText();
     void DoMoveToEndOfText();
     void DoMoveToEndOfEntry();

+    void DoGetWindowCoordinates();

 
     // return true if currently text control has any selection
     bool HasSelection() const
 
     // return true if currently text control has any selection
     bool HasSelection() const


@@ -163,12 +177,12 @@ public:
 #if wxUSE_CLIPBOARD
     void OnPasteFromClipboard( wxCommandEvent& WXUNUSED(event) )
     {
 #if wxUSE_CLIPBOARD
     void OnPasteFromClipboard( wxCommandEvent& WXUNUSED(event) )
     {

-        wxLogMessage(_T("Pasting text from clipboard."));
+        wxLogMessage(wxT("Pasting text from clipboard."));

         m_panel->DoPasteFromClipboard();
     }
     void OnCopyToClipboard( wxCommandEvent& WXUNUSED(event) )
     {
         m_panel->DoPasteFromClipboard();
     }
     void OnCopyToClipboard( wxCommandEvent& WXUNUSED(event) )
     {

-        wxLogMessage(_T("Copying text to clipboard."));
+        wxLogMessage(wxT("Copying text to clipboard."));

         m_panel->DoCopyToClipboard();
     }
 
         m_panel->DoCopyToClipboard();
     }
 


@@ -185,6 +199,12 @@ public:
     }
 #endif // wxUSE_CLIPBOARD
 
     }
 #endif // wxUSE_CLIPBOARD
 

+    void OnAddTextLine(wxCommandEvent& WXUNUSED(event))
+    {
+        static int s_n = 0;
+        m_panel->m_textrich->AppendText(wxString::Format("Line %d\n", ++s_n));
+    }
+

     void OnAddTextFreeze( wxCommandEvent& WXUNUSED(event) )
         { DoAddText(true); }
     void OnAddText( wxCommandEvent& WXUNUSED(event) )
     void OnAddTextFreeze( wxCommandEvent& WXUNUSED(event) )
         { DoAddText(true); }
     void OnAddText( wxCommandEvent& WXUNUSED(event) )


@@ -198,31 +218,43 @@ public:
 
     void OnMoveToEndOfText( wxCommandEvent& WXUNUSED(event) )
         { m_panel->DoMoveToEndOfText(); }
 
     void OnMoveToEndOfText( wxCommandEvent& WXUNUSED(event) )
         { m_panel->DoMoveToEndOfText(); }

+
+    void OnGetWindowCoordinates( wxCommandEvent& WXUNUSED(event) )
+        { m_panel->DoGetWindowCoordinates(); }
+

     void OnMoveToEndOfEntry( wxCommandEvent& WXUNUSED(event) )
         { m_panel->DoMoveToEndOfEntry(); }
 
     void OnScrollLineDown(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->LineDown() )
     void OnMoveToEndOfEntry( wxCommandEvent& WXUNUSED(event) )
         { m_panel->DoMoveToEndOfEntry(); }
 
     void OnScrollLineDown(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->LineDown() )

-            wxLogMessage(_T("Already at the bottom"));
+        {
+            wxLogMessage(wxT("Already at the bottom"));
+        }

     }
 
     void OnScrollLineUp(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->LineUp() )
     }
 
     void OnScrollLineUp(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->LineUp() )

-            wxLogMessage(_T("Already at the top"));
+        {
+            wxLogMessage(wxT("Already at the top"));
+        }

     }
 
     void OnScrollPageDown(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->PageDown() )
     }
 
     void OnScrollPageDown(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->PageDown() )

-            wxLogMessage(_T("Already at the bottom"));
+        {
+            wxLogMessage(wxT("Already at the bottom"));
+        }

     }
 
     void OnScrollPageUp(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->PageUp() )
     }
 
     void OnScrollPageUp(wxCommandEvent& WXUNUSED(event))
     {
         if ( !m_panel->m_textrich->PageUp() )

-            wxLogMessage(_T("Already at the top"));
+        {
+            wxLogMessage(wxT("Already at the top"));
+        }

     }
 
     void OnGetLine(wxCommandEvent& WXUNUSED(event))
     }
 
     void OnGetLine(wxCommandEvent& WXUNUSED(event))


@@ -281,9 +313,19 @@ public:
         MyTextCtrl::ms_logFocus = event.IsChecked();
     }
 
         MyTextCtrl::ms_logFocus = event.IsChecked();
     }
 

+    void OnLogClip(wxCommandEvent& event)
+    {
+        MyTextCtrl::ms_logClip = event.IsChecked();
+    }
+

     void OnSetText(wxCommandEvent& WXUNUSED(event))
     {
     void OnSetText(wxCommandEvent& WXUNUSED(event))
     {

-        m_panel->m_text->SetValue(_T("Hello, world (what else did you expect)?"));
+        m_panel->m_text->SetValue(wxT("Hello, world! (what else did you expect?)"));
+    }
+
+    void OnChangeText(wxCommandEvent& WXUNUSED(event))
+    {
+        m_panel->m_text->ChangeValue(wxT("Changed, not set: no event"));

     }
 
     void OnIdle( wxIdleEvent& event );
     }
 
     void OnIdle( wxIdleEvent& event );


@@ -292,20 +334,21 @@ private:
     void DoAddText(bool freeze)
     {
         wxTextCtrl * const text = m_panel->m_textrich;
     void DoAddText(bool freeze)
     {
         wxTextCtrl * const text = m_panel->m_textrich;

-        text->Clear();

 
         if ( freeze )
             text->Freeze();
 
 
         if ( freeze )
             text->Freeze();
 

+        text->Clear();
+

         for ( int i = 0; i < 100; i++ )
         {
             text->AppendText(wxString::Format(wxT("Line %i\n"), i));
         }
 
         for ( int i = 0; i < 100; i++ )
         {
             text->AppendText(wxString::Format(wxT("Line %i\n"), i));
         }
 

+        text->SetInsertionPoint(0);
+

         if ( freeze )
             text->Thaw();
         if ( freeze )
             text->Thaw();

-
-        text->SetInsertionPoint(0);

     }
 
     MyPanel *m_panel;
     }
 
     MyPanel *m_panel;


@@ -335,6 +378,7 @@ public:
     void OnChangeBackgroundColour(wxCommandEvent& event);
     void OnLeftIndent(wxCommandEvent& event);
     void OnRightIndent(wxCommandEvent& event);
     void OnChangeBackgroundColour(wxCommandEvent& event);
     void OnLeftIndent(wxCommandEvent& event);
     void OnRightIndent(wxCommandEvent& event);

+    void OnTabStops(wxCommandEvent& event);

 
 private:
     wxTextCtrl *m_textCtrl;
 
 private:
     wxTextCtrl *m_textCtrl;


@@ -365,6 +409,7 @@ enum
     // clipboard menu
     TEXT_CLIPBOARD_COPY = 200,
     TEXT_CLIPBOARD_PASTE,
     // clipboard menu
     TEXT_CLIPBOARD_COPY = 200,
     TEXT_CLIPBOARD_PASTE,

+    TEXT_CLIPBOARD_VETO,

 
     // tooltip menu
     TEXT_TOOLTIPS_SETDELAY = 300,
 
     // tooltip menu
     TEXT_TOOLTIPS_SETDELAY = 300,


@@ -373,7 +418,9 @@ enum
     // text menu
     TEXT_ADD_SOME = 400,
     TEXT_ADD_FREEZE,
     // text menu
     TEXT_ADD_SOME = 400,
     TEXT_ADD_FREEZE,

+    TEXT_ADD_LINE,

     TEXT_MOVE_ENDTEXT,
     TEXT_MOVE_ENDTEXT,

+    TEXT_GET_WINDOW_COORD,

     TEXT_MOVE_ENDENTRY,
     TEXT_SET_EDITABLE,
     TEXT_SET_ENABLED,
     TEXT_MOVE_ENDENTRY,
     TEXT_SET_EDITABLE,
     TEXT_SET_ENABLED,


@@ -389,6 +436,7 @@ enum
     TEXT_REPLACE,
     TEXT_SELECT,
     TEXT_SET,
     TEXT_REPLACE,
     TEXT_SELECT,
     TEXT_SET,

+    TEXT_CHANGE,

 
     // log menu
     TEXT_LOG_KEY,
 
     // log menu
     TEXT_LOG_KEY,


@@ -396,106 +444,114 @@ enum
     TEXT_LOG_MOUSE,
     TEXT_LOG_TEXT,
     TEXT_LOG_FOCUS,
     TEXT_LOG_MOUSE,
     TEXT_LOG_TEXT,
     TEXT_LOG_FOCUS,

+    TEXT_LOG_CLIP,

 
     TEXT_END
 };
 
 bool MyApp::OnInit()
 {
 
     TEXT_END
 };
 
 bool MyApp::OnInit()
 {

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

     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,

-            _T("Text wxWidgets sample"), 50, 50, 700, 550);
+            wxT("Text wxWidgets sample"), 50, 50, 700, 550);

     frame->SetSizeHints( 500, 400 );
 
     wxMenu *file_menu = new wxMenu;
     frame->SetSizeHints( 500, 400 );
 
     wxMenu *file_menu = new wxMenu;

-    file_menu->Append(TEXT_SAVE, _T("&Save file\tCtrl-S"),
-                      _T("Save the text control contents to file"));
-    file_menu->Append(TEXT_LOAD, _T("&Load file\tCtrl-O"),
-                      _T("Load the sample file into text control"));
+    file_menu->Append(TEXT_SAVE, wxT("&Save file\tCtrl-S"),
+                      wxT("Save the text control contents to file"));
+    file_menu->Append(TEXT_LOAD, wxT("&Load file\tCtrl-O"),
+                      wxT("Load the sample file into text control"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(TEXT_RICH_TEXT_TEST, _T("Show Rich Text Editor"));
+    file_menu->Append(TEXT_RICH_TEXT_TEST, wxT("Show Rich Text Editor"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(TEXT_ABOUT, _T("&About\tAlt-A"));
+    file_menu->Append(TEXT_ABOUT, wxT("&About\tAlt-A"));

     file_menu->AppendSeparator();
     file_menu->AppendSeparator();

-    file_menu->Append(TEXT_QUIT, _T("E&xit\tAlt-X"), _T("Quit this sample"));
+    file_menu->Append(TEXT_QUIT, wxT("E&xit\tAlt-X"), wxT("Quit this sample"));

 
     wxMenuBar *menu_bar = new wxMenuBar( wxMB_DOCKABLE );
 
     wxMenuBar *menu_bar = new wxMenuBar( wxMB_DOCKABLE );

-    menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(file_menu, wxT("&File"));

 
 #if wxUSE_TOOLTIPS
     wxMenu *tooltip_menu = new wxMenu;
 
 #if wxUSE_TOOLTIPS
     wxMenu *tooltip_menu = new wxMenu;

-    tooltip_menu->Append(TEXT_TOOLTIPS_SETDELAY, _T("Set &delay\tCtrl-D"));
+    tooltip_menu->Append(TEXT_TOOLTIPS_SETDELAY, wxT("Set &delay\tCtrl-D"));

     tooltip_menu->AppendSeparator();
     tooltip_menu->AppendSeparator();

-    tooltip_menu->Append(TEXT_TOOLTIPS_ENABLE, _T("&Toggle tooltips\tCtrl-T"),
-            _T("enable/disable tooltips"), true);
+    tooltip_menu->Append(TEXT_TOOLTIPS_ENABLE, wxT("&Toggle tooltips\tCtrl-T"),
+            wxT("enable/disable tooltips"), true);

     tooltip_menu->Check(TEXT_TOOLTIPS_ENABLE, true);
     tooltip_menu->Check(TEXT_TOOLTIPS_ENABLE, true);

-    menu_bar->Append(tooltip_menu, _T("&Tooltips"));
+    menu_bar->Append(tooltip_menu, wxT("&Tooltips"));

 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD
     // notice that we use non default accelerators on purpose here to compare
     // their behaviour with the built in handling of standard Ctrl/Cmd-C/V
     wxMenu *menuClipboard = new wxMenu;
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD
     // notice that we use non default accelerators on purpose here to compare
     // their behaviour with the built in handling of standard Ctrl/Cmd-C/V
     wxMenu *menuClipboard = new wxMenu;

-    menuClipboard->Append(TEXT_CLIPBOARD_COPY, _T("&Copy\tCtrl-Shift-C"),
-                          _T("Copy the selection to the clipboard"));
-    menuClipboard->Append(TEXT_CLIPBOARD_PASTE, _T("&Paste\tCtrl-Shift-V"),
-                          _T("Paste from clipboard to the text control"));
-    menu_bar->Append(menuClipboard, _T("&Clipboard"));
+    menuClipboard->Append(TEXT_CLIPBOARD_COPY, wxT("&Copy\tCtrl-Shift-C"),
+                          wxT("Copy the selection to the clipboard"));
+    menuClipboard->Append(TEXT_CLIPBOARD_PASTE, wxT("&Paste\tCtrl-Shift-V"),
+                          wxT("Paste from clipboard to the text control"));
+    menuClipboard->AppendSeparator();
+    menuClipboard->AppendCheckItem(TEXT_CLIPBOARD_VETO, wxT("Vet&o\tCtrl-Shift-O"),
+                                   wxT("Veto all clipboard operations"));
+    menu_bar->Append(menuClipboard, wxT("&Clipboard"));

 #endif // wxUSE_CLIPBOARD
 
     wxMenu *menuText = new wxMenu;
 #endif // wxUSE_CLIPBOARD
 
     wxMenu *menuText = new wxMenu;

-    menuText->Append(TEXT_ADD_SOME, _T("&Append some text\tCtrl-A"));
-    menuText->Append(TEXT_ADD_FREEZE, _T("&Append text with freeze/thaw\tShift-Ctrl-A"));
-    menuText->Append(TEXT_REMOVE, _T("&Remove first 10 characters\tCtrl-Y"));
-    menuText->Append(TEXT_REPLACE, _T("&Replace characters 4 to 8 with ABC\tCtrl-R"));
-    menuText->Append(TEXT_SELECT, _T("&Select characters 4 to 8\tCtrl-I"));
-    menuText->Append(TEXT_SET, _T("&Set the first text zone value\tCtrl-E"));
+    menuText->Append(TEXT_ADD_SOME, wxT("&Append some text\tCtrl-A"));
+    menuText->Append(TEXT_ADD_FREEZE, wxT("&Append text with freeze/thaw\tShift-Ctrl-A"));
+    menuText->Append(TEXT_ADD_LINE, wxT("Append a new &line\tAlt-Shift-A"));
+    menuText->Append(TEXT_REMOVE, wxT("&Remove first 10 characters\tCtrl-Y"));
+    menuText->Append(TEXT_REPLACE, wxT("&Replace characters 4 to 8 with ABC\tCtrl-R"));
+    menuText->Append(TEXT_SELECT, wxT("&Select characters 4 to 8\tCtrl-I"));
+    menuText->Append(TEXT_SET, wxT("&Set the first text zone value\tCtrl-E"));
+    menuText->Append(TEXT_CHANGE, wxT("&Change the first text zone value\tShift-Ctrl-E"));

     menuText->AppendSeparator();
     menuText->AppendSeparator();

-    menuText->Append(TEXT_MOVE_ENDTEXT, _T("Move cursor to the end of &text"));
-    menuText->Append(TEXT_MOVE_ENDENTRY, _T("Move cursor to the end of &entry"));
-    menuText->AppendCheckItem(TEXT_SET_EDITABLE, _T("Toggle &editable state"));
-    menuText->AppendCheckItem(TEXT_SET_ENABLED, _T("Toggle e&nabled state"));
+    menuText->Append(TEXT_MOVE_ENDTEXT, wxT("Move cursor to the end of &text"));
+    menuText->Append(TEXT_MOVE_ENDENTRY, wxT("Move cursor to the end of &entry"));
+    menuText->AppendCheckItem(TEXT_SET_EDITABLE, wxT("Toggle &editable state"));
+    menuText->AppendCheckItem(TEXT_SET_ENABLED, wxT("Toggle e&nabled state"));

     menuText->Check(TEXT_SET_EDITABLE, true);
     menuText->Check(TEXT_SET_ENABLED, true);
     menuText->AppendSeparator();
     menuText->Check(TEXT_SET_EDITABLE, true);
     menuText->Check(TEXT_SET_ENABLED, true);
     menuText->AppendSeparator();

-    menuText->Append(TEXT_LINE_DOWN, _T("Scroll text one line down"));
-    menuText->Append(TEXT_LINE_UP, _T("Scroll text one line up"));
-    menuText->Append(TEXT_PAGE_DOWN, _T("Scroll text one page down"));
-    menuText->Append(TEXT_PAGE_UP, _T("Scroll text one page up"));
+    menuText->Append(TEXT_LINE_DOWN, wxT("Scroll text one line down"));
+    menuText->Append(TEXT_LINE_UP, wxT("Scroll text one line up"));
+    menuText->Append(TEXT_PAGE_DOWN, wxT("Scroll text one page down"));
+    menuText->Append(TEXT_PAGE_UP, wxT("Scroll text one page up"));
+    menuText->Append(TEXT_GET_WINDOW_COORD, wxT("Get window coordinates"));

     menuText->AppendSeparator();
     menuText->AppendSeparator();

-    menuText->Append(TEXT_GET_LINE, _T("Get the text of a line of the tabbed multiline"));
-    menuText->Append(TEXT_GET_LINELENGTH, _T("Get the length of a line of the tabbed multiline"));
-    menu_bar->Append(menuText, _T("Te&xt"));
+    menuText->Append(TEXT_GET_LINE, wxT("Get the text of a line of the tabbed multiline"));
+    menuText->Append(TEXT_GET_LINELENGTH, wxT("Get the length of a line of the tabbed multiline"));
+    menu_bar->Append(menuText, wxT("Te&xt"));

 
 #if wxUSE_LOG
     wxMenu *menuLog = new wxMenu;
 
 #if wxUSE_LOG
     wxMenu *menuLog = new wxMenu;

-    menuLog->AppendCheckItem(TEXT_LOG_KEY, _T("Log &key events"));
-    menuLog->AppendCheckItem(TEXT_LOG_CHAR, _T("Log &char events"));
-    menuLog->AppendCheckItem(TEXT_LOG_MOUSE, _T("Log &mouse events"));
-    menuLog->AppendCheckItem(TEXT_LOG_TEXT, _T("Log &text events"));
-    menuLog->AppendCheckItem(TEXT_LOG_FOCUS, _T("Log &focus events"));
+    menuLog->AppendCheckItem(TEXT_LOG_KEY, wxT("Log &key events"));
+    menuLog->AppendCheckItem(TEXT_LOG_CHAR, wxT("Log &char events"));
+    menuLog->AppendCheckItem(TEXT_LOG_MOUSE, wxT("Log &mouse events"));
+    menuLog->AppendCheckItem(TEXT_LOG_TEXT, wxT("Log &text events"));
+    menuLog->AppendCheckItem(TEXT_LOG_FOCUS, wxT("Log &focus events"));
+    menuLog->AppendCheckItem(TEXT_LOG_CLIP, wxT("Log clip&board events"));

     menuLog->AppendSeparator();
     menuLog->AppendSeparator();

-    menuLog->Append(TEXT_CLEAR, _T("&Clear the log\tCtrl-L"),
-                    _T("Clear the log window contents"));
+    menuLog->Append(TEXT_CLEAR, wxT("&Clear the log\tCtrl-L"),
+                    wxT("Clear the log window contents"));

 
     // select only the interesting events by default
 
     // select only the interesting events by default

-    MyTextCtrl::ms_logKey =
-    MyTextCtrl::ms_logChar = false;
+    MyTextCtrl::ms_logClip =

     MyTextCtrl::ms_logText = true;
 
     menuLog->Check(TEXT_LOG_KEY, MyTextCtrl::ms_logKey);
     menuLog->Check(TEXT_LOG_CHAR, MyTextCtrl::ms_logChar);
     menuLog->Check(TEXT_LOG_TEXT, MyTextCtrl::ms_logText);
 
     MyTextCtrl::ms_logText = true;
 
     menuLog->Check(TEXT_LOG_KEY, MyTextCtrl::ms_logKey);
     menuLog->Check(TEXT_LOG_CHAR, MyTextCtrl::ms_logChar);
     menuLog->Check(TEXT_LOG_TEXT, MyTextCtrl::ms_logText);
 

-    menu_bar->Append(menuLog, _T("&Log"));
+    menu_bar->Append(menuLog, wxT("&Log"));

 #endif // wxUSE_LOG
 
     frame->SetMenuBar(menu_bar);
 
     frame->Show(true);
 
 #endif // wxUSE_LOG
 
     frame->SetMenuBar(menu_bar);
 
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     // report success
     return true;
 }
     // report success
     return true;
 }


@@ -510,8 +566,12 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
     EVT_CHAR(MyTextCtrl::OnChar)
 
     EVT_TEXT(wxID_ANY, MyTextCtrl::OnText)
     EVT_CHAR(MyTextCtrl::OnChar)
 
     EVT_TEXT(wxID_ANY, MyTextCtrl::OnText)

+    EVT_TEXT_ENTER(wxID_ANY, MyTextCtrl::OnTextEnter)

     EVT_TEXT_URL(wxID_ANY, MyTextCtrl::OnTextURL)
     EVT_TEXT_MAXLEN(wxID_ANY, MyTextCtrl::OnTextMaxLen)
     EVT_TEXT_URL(wxID_ANY, MyTextCtrl::OnTextURL)
     EVT_TEXT_MAXLEN(wxID_ANY, MyTextCtrl::OnTextMaxLen)

+    EVT_TEXT_CUT(wxID_ANY,   MyTextCtrl::OnTextCut)
+    EVT_TEXT_COPY(wxID_ANY,  MyTextCtrl::OnTextCopy)
+    EVT_TEXT_PASTE(wxID_ANY, MyTextCtrl::OnTextPaste)

 
     EVT_MOUSE_EVENTS(MyTextCtrl::OnMouseEvent)
 
 
     EVT_MOUSE_EVENTS(MyTextCtrl::OnMouseEvent)
 


@@ -524,6 +584,7 @@ bool MyTextCtrl::ms_logChar = false;
 bool MyTextCtrl::ms_logMouse = false;
 bool MyTextCtrl::ms_logText = false;
 bool MyTextCtrl::ms_logFocus = false;
 bool MyTextCtrl::ms_logMouse = false;
 bool MyTextCtrl::ms_logText = false;
 bool MyTextCtrl::ms_logFocus = false;

+bool MyTextCtrl::ms_logClip = false;

 
 void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
 {
 
 void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
 {


@@ -532,131 +593,128 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
     {
         switch ( keycode )
         {
     {
         switch ( keycode )
         {

-            case WXK_BACK: key = _T("BACK"); break;
-            case WXK_TAB: key = _T("TAB"); break;
-            case WXK_RETURN: key = _T("RETURN"); break;
-            case WXK_ESCAPE: key = _T("ESCAPE"); break;
-            case WXK_SPACE: key = _T("SPACE"); break;
-            case WXK_DELETE: key = _T("DELETE"); break;
-            case WXK_START: key = _T("START"); break;
-            case WXK_LBUTTON: key = _T("LBUTTON"); break;
-            case WXK_RBUTTON: key = _T("RBUTTON"); break;
-            case WXK_CANCEL: key = _T("CANCEL"); break;
-            case WXK_MBUTTON: key = _T("MBUTTON"); break;
-            case WXK_CLEAR: key = _T("CLEAR"); break;
-            case WXK_SHIFT: key = _T("SHIFT"); break;
-            case WXK_ALT: key = _T("ALT"); break;
-            case WXK_CONTROL: key = _T("CONTROL"); break;
-            case WXK_MENU: key = _T("MENU"); break;
-            case WXK_PAUSE: key = _T("PAUSE"); break;
-            case WXK_CAPITAL: key = _T("CAPITAL"); break;
-            case WXK_PRIOR: key = _T("PRIOR"); break;
-            case WXK_NEXT: key = _T("NEXT"); break;
-            case WXK_END: key = _T("END"); break;
-            case WXK_HOME: key = _T("HOME"); break;
-            case WXK_LEFT: key = _T("LEFT"); break;
-            case WXK_UP: key = _T("UP"); break;
-            case WXK_RIGHT: key = _T("RIGHT"); break;
-            case WXK_DOWN: key = _T("DOWN"); break;
-            case WXK_SELECT: key = _T("SELECT"); break;
-            case WXK_PRINT: key = _T("PRINT"); break;
-            case WXK_EXECUTE: key = _T("EXECUTE"); break;
-            case WXK_SNAPSHOT: key = _T("SNAPSHOT"); break;
-            case WXK_INSERT: key = _T("INSERT"); break;
-            case WXK_HELP: key = _T("HELP"); break;
-            case WXK_NUMPAD0: key = _T("NUMPAD0"); break;
-            case WXK_NUMPAD1: key = _T("NUMPAD1"); break;
-            case WXK_NUMPAD2: key = _T("NUMPAD2"); break;
-            case WXK_NUMPAD3: key = _T("NUMPAD3"); break;
-            case WXK_NUMPAD4: key = _T("NUMPAD4"); break;
-            case WXK_NUMPAD5: key = _T("NUMPAD5"); break;
-            case WXK_NUMPAD6: key = _T("NUMPAD6"); break;
-            case WXK_NUMPAD7: key = _T("NUMPAD7"); break;
-            case WXK_NUMPAD8: key = _T("NUMPAD8"); break;
-            case WXK_NUMPAD9: key = _T("NUMPAD9"); break;
-            case WXK_MULTIPLY: key = _T("MULTIPLY"); break;
-            case WXK_ADD: key = _T("ADD"); break;
-            case WXK_SEPARATOR: key = _T("SEPARATOR"); break;
-            case WXK_SUBTRACT: key = _T("SUBTRACT"); break;
-            case WXK_DECIMAL: key = _T("DECIMAL"); break;
-            case WXK_DIVIDE: key = _T("DIVIDE"); break;
-            case WXK_F1: key = _T("F1"); break;
-            case WXK_F2: key = _T("F2"); break;
-            case WXK_F3: key = _T("F3"); break;
-            case WXK_F4: key = _T("F4"); break;
-            case WXK_F5: key = _T("F5"); break;
-            case WXK_F6: key = _T("F6"); break;
-            case WXK_F7: key = _T("F7"); break;
-            case WXK_F8: key = _T("F8"); break;
-            case WXK_F9: key = _T("F9"); break;
-            case WXK_F10: key = _T("F10"); break;
-            case WXK_F11: key = _T("F11"); break;
-            case WXK_F12: key = _T("F12"); break;
-            case WXK_F13: key = _T("F13"); break;
-            case WXK_F14: key = _T("F14"); break;
-            case WXK_F15: key = _T("F15"); break;
-            case WXK_F16: key = _T("F16"); break;
-            case WXK_F17: key = _T("F17"); break;
-            case WXK_F18: key = _T("F18"); break;
-            case WXK_F19: key = _T("F19"); break;
-            case WXK_F20: key = _T("F20"); break;
-            case WXK_F21: key = _T("F21"); break;
-            case WXK_F22: key = _T("F22"); break;
-            case WXK_F23: key = _T("F23"); break;
-            case WXK_F24: key = _T("F24"); break;
-            case WXK_NUMLOCK: key = _T("NUMLOCK"); break;
-            case WXK_SCROLL: key = _T("SCROLL"); break;
-            case WXK_PAGEUP: key = _T("PAGEUP"); break;
-            case WXK_PAGEDOWN: key = _T("PAGEDOWN"); break;
-            case WXK_NUMPAD_SPACE: key = _T("NUMPAD_SPACE"); break;
-            case WXK_NUMPAD_TAB: key = _T("NUMPAD_TAB"); break;
-            case WXK_NUMPAD_ENTER: key = _T("NUMPAD_ENTER"); break;
-            case WXK_NUMPAD_F1: key = _T("NUMPAD_F1"); break;
-            case WXK_NUMPAD_F2: key = _T("NUMPAD_F2"); break;
-            case WXK_NUMPAD_F3: key = _T("NUMPAD_F3"); break;
-            case WXK_NUMPAD_F4: key = _T("NUMPAD_F4"); break;
-            case WXK_NUMPAD_HOME: key = _T("NUMPAD_HOME"); break;
-            case WXK_NUMPAD_LEFT: key = _T("NUMPAD_LEFT"); break;
-            case WXK_NUMPAD_UP: key = _T("NUMPAD_UP"); break;
-            case WXK_NUMPAD_RIGHT: key = _T("NUMPAD_RIGHT"); break;
-            case WXK_NUMPAD_DOWN: key = _T("NUMPAD_DOWN"); break;
-            case WXK_NUMPAD_PRIOR: key = _T("NUMPAD_PRIOR"); break;
-            case WXK_NUMPAD_PAGEUP: key = _T("NUMPAD_PAGEUP"); break;
-            case WXK_NUMPAD_PAGEDOWN: key = _T("NUMPAD_PAGEDOWN"); break;
-            case WXK_NUMPAD_END: key = _T("NUMPAD_END"); break;
-            case WXK_NUMPAD_BEGIN: key = _T("NUMPAD_BEGIN"); break;
-            case WXK_NUMPAD_INSERT: key = _T("NUMPAD_INSERT"); break;
-            case WXK_NUMPAD_DELETE: key = _T("NUMPAD_DELETE"); break;
-            case WXK_NUMPAD_EQUAL: key = _T("NUMPAD_EQUAL"); break;
-            case WXK_NUMPAD_MULTIPLY: key = _T("NUMPAD_MULTIPLY"); break;
-            case WXK_NUMPAD_ADD: key = _T("NUMPAD_ADD"); break;
-            case WXK_NUMPAD_SEPARATOR: key = _T("NUMPAD_SEPARATOR"); break;
-            case WXK_NUMPAD_SUBTRACT: key = _T("NUMPAD_SUBTRACT"); break;
-            case WXK_NUMPAD_DECIMAL: key = _T("NUMPAD_DECIMAL"); break;
+            case WXK_BACK: key = wxT("BACK"); break;
+            case WXK_TAB: key = wxT("TAB"); break;
+            case WXK_RETURN: key = wxT("RETURN"); break;
+            case WXK_ESCAPE: key = wxT("ESCAPE"); break;
+            case WXK_SPACE: key = wxT("SPACE"); break;
+            case WXK_DELETE: key = wxT("DELETE"); break;
+            case WXK_START: key = wxT("START"); break;
+            case WXK_LBUTTON: key = wxT("LBUTTON"); break;
+            case WXK_RBUTTON: key = wxT("RBUTTON"); break;
+            case WXK_CANCEL: key = wxT("CANCEL"); break;
+            case WXK_MBUTTON: key = wxT("MBUTTON"); break;
+            case WXK_CLEAR: key = wxT("CLEAR"); break;
+            case WXK_SHIFT: key = wxT("SHIFT"); break;
+            case WXK_ALT: key = wxT("ALT"); break;
+            case WXK_CONTROL: key = wxT("CONTROL"); break;
+            case WXK_MENU: key = wxT("MENU"); break;
+            case WXK_PAUSE: key = wxT("PAUSE"); break;
+            case WXK_CAPITAL: key = wxT("CAPITAL"); break;
+            case WXK_END: key = wxT("END"); break;
+            case WXK_HOME: key = wxT("HOME"); break;
+            case WXK_LEFT: key = wxT("LEFT"); break;
+            case WXK_UP: key = wxT("UP"); break;
+            case WXK_RIGHT: key = wxT("RIGHT"); break;
+            case WXK_DOWN: key = wxT("DOWN"); break;
+            case WXK_SELECT: key = wxT("SELECT"); break;
+            case WXK_PRINT: key = wxT("PRINT"); break;
+            case WXK_EXECUTE: key = wxT("EXECUTE"); break;
+            case WXK_SNAPSHOT: key = wxT("SNAPSHOT"); break;
+            case WXK_INSERT: key = wxT("INSERT"); break;
+            case WXK_HELP: key = wxT("HELP"); break;
+            case WXK_NUMPAD0: key = wxT("NUMPAD0"); break;
+            case WXK_NUMPAD1: key = wxT("NUMPAD1"); break;
+            case WXK_NUMPAD2: key = wxT("NUMPAD2"); break;
+            case WXK_NUMPAD3: key = wxT("NUMPAD3"); break;
+            case WXK_NUMPAD4: key = wxT("NUMPAD4"); break;
+            case WXK_NUMPAD5: key = wxT("NUMPAD5"); break;
+            case WXK_NUMPAD6: key = wxT("NUMPAD6"); break;
+            case WXK_NUMPAD7: key = wxT("NUMPAD7"); break;
+            case WXK_NUMPAD8: key = wxT("NUMPAD8"); break;
+            case WXK_NUMPAD9: key = wxT("NUMPAD9"); break;
+            case WXK_MULTIPLY: key = wxT("MULTIPLY"); break;
+            case WXK_ADD: key = wxT("ADD"); break;
+            case WXK_SEPARATOR: key = wxT("SEPARATOR"); break;
+            case WXK_SUBTRACT: key = wxT("SUBTRACT"); break;
+            case WXK_DECIMAL: key = wxT("DECIMAL"); break;
+            case WXK_DIVIDE: key = wxT("DIVIDE"); break;
+            case WXK_F1: key = wxT("F1"); break;
+            case WXK_F2: key = wxT("F2"); break;
+            case WXK_F3: key = wxT("F3"); break;
+            case WXK_F4: key = wxT("F4"); break;
+            case WXK_F5: key = wxT("F5"); break;
+            case WXK_F6: key = wxT("F6"); break;
+            case WXK_F7: key = wxT("F7"); break;
+            case WXK_F8: key = wxT("F8"); break;
+            case WXK_F9: key = wxT("F9"); break;
+            case WXK_F10: key = wxT("F10"); break;
+            case WXK_F11: key = wxT("F11"); break;
+            case WXK_F12: key = wxT("F12"); break;
+            case WXK_F13: key = wxT("F13"); break;
+            case WXK_F14: key = wxT("F14"); break;
+            case WXK_F15: key = wxT("F15"); break;
+            case WXK_F16: key = wxT("F16"); break;
+            case WXK_F17: key = wxT("F17"); break;
+            case WXK_F18: key = wxT("F18"); break;
+            case WXK_F19: key = wxT("F19"); break;
+            case WXK_F20: key = wxT("F20"); break;
+            case WXK_F21: key = wxT("F21"); break;
+            case WXK_F22: key = wxT("F22"); break;
+            case WXK_F23: key = wxT("F23"); break;
+            case WXK_F24: key = wxT("F24"); break;
+            case WXK_NUMLOCK: key = wxT("NUMLOCK"); break;
+            case WXK_SCROLL: key = wxT("SCROLL"); break;
+            case WXK_PAGEUP: key = wxT("PAGEUP"); break;
+            case WXK_PAGEDOWN: key = wxT("PAGEDOWN"); break;
+            case WXK_NUMPAD_SPACE: key = wxT("NUMPAD_SPACE"); break;
+            case WXK_NUMPAD_TAB: key = wxT("NUMPAD_TAB"); break;
+            case WXK_NUMPAD_ENTER: key = wxT("NUMPAD_ENTER"); break;
+            case WXK_NUMPAD_F1: key = wxT("NUMPAD_F1"); break;
+            case WXK_NUMPAD_F2: key = wxT("NUMPAD_F2"); break;
+            case WXK_NUMPAD_F3: key = wxT("NUMPAD_F3"); break;
+            case WXK_NUMPAD_F4: key = wxT("NUMPAD_F4"); break;
+            case WXK_NUMPAD_HOME: key = wxT("NUMPAD_HOME"); break;
+            case WXK_NUMPAD_LEFT: key = wxT("NUMPAD_LEFT"); break;
+            case WXK_NUMPAD_UP: key = wxT("NUMPAD_UP"); break;
+            case WXK_NUMPAD_RIGHT: key = wxT("NUMPAD_RIGHT"); break;
+            case WXK_NUMPAD_DOWN: key = wxT("NUMPAD_DOWN"); break;
+            case WXK_NUMPAD_PAGEUP: key = wxT("NUMPAD_PAGEUP"); break;
+            case WXK_NUMPAD_PAGEDOWN: key = wxT("NUMPAD_PAGEDOWN"); break;
+            case WXK_NUMPAD_END: key = wxT("NUMPAD_END"); break;
+            case WXK_NUMPAD_BEGIN: key = wxT("NUMPAD_BEGIN"); break;
+            case WXK_NUMPAD_INSERT: key = wxT("NUMPAD_INSERT"); break;
+            case WXK_NUMPAD_DELETE: key = wxT("NUMPAD_DELETE"); break;
+            case WXK_NUMPAD_EQUAL: key = wxT("NUMPAD_EQUAL"); break;
+            case WXK_NUMPAD_MULTIPLY: key = wxT("NUMPAD_MULTIPLY"); break;
+            case WXK_NUMPAD_ADD: key = wxT("NUMPAD_ADD"); break;
+            case WXK_NUMPAD_SEPARATOR: key = wxT("NUMPAD_SEPARATOR"); break;
+            case WXK_NUMPAD_SUBTRACT: key = wxT("NUMPAD_SUBTRACT"); break;
+            case WXK_NUMPAD_DECIMAL: key = wxT("NUMPAD_DECIMAL"); break;

 
             default:
             {
                if ( wxIsprint((int)keycode) )
 
             default:
             {
                if ( wxIsprint((int)keycode) )

-                   key.Printf(_T("'%c'"), (char)keycode);
+                   key.Printf(wxT("'%c'"), (char)keycode);

                else if ( keycode > 0 && keycode < 27 )
                else if ( keycode > 0 && keycode < 27 )

-                   key.Printf(_("Ctrl-%c"), _T('A') + keycode - 1);
+                   key.Printf(_("Ctrl-%c"), wxT('A') + keycode - 1);

                else
                else

-                   key.Printf(_T("unknown (%ld)"), keycode);
+                   key.Printf(wxT("unknown (%ld)"), keycode);

             }
         }
     }
 
 #if wxUSE_UNICODE
             }
         }
     }
 
 #if wxUSE_UNICODE

-    key += wxString::Format(_T(" (Unicode: %#04x)"), event.GetUnicodeKey());
+    key += wxString::Format(wxT(" (Unicode: %#04x)"), event.GetUnicodeKey());

 #endif // wxUSE_UNICODE
 
 #endif // wxUSE_UNICODE
 

-    wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"),
+    wxLogMessage( wxT("%s event: %s (flags = %c%c%c%c)"),

                   name,
                   key.c_str(),
                   name,
                   key.c_str(),

-                  GetChar( event.ControlDown(), _T('C') ),
-                  GetChar( event.AltDown(), _T('A') ),
-                  GetChar( event.ShiftDown(), _T('S') ),
-                  GetChar( event.MetaDown(), _T('M') ) );
+                  GetChar( event.ControlDown(), wxT('C') ),
+                  GetChar( event.AltDown(), wxT('A') ),
+                  GetChar( event.ShiftDown(), wxT('S') ),
+                  GetChar( event.MetaDown(), wxT('M') ) );

 }
 
 static wxString GetMouseEventDesc(const wxMouseEvent& ev)
 }
 
 static wxString GetMouseEventDesc(const wxMouseEvent& ev)


@@ -666,31 +724,48 @@ static wxString GetMouseEventDesc(const wxMouseEvent& ev)
     bool dbl, up;
     if ( ev.LeftDown() || ev.LeftUp() || ev.LeftDClick() )
     {
     bool dbl, up;
     if ( ev.LeftDown() || ev.LeftUp() || ev.LeftDClick() )
     {

-        button = _T("Left");
+        button = wxT("Left");

         dbl = ev.LeftDClick();
         up = ev.LeftUp();
     }
     else if ( ev.MiddleDown() || ev.MiddleUp() || ev.MiddleDClick() )
     {
         dbl = ev.LeftDClick();
         up = ev.LeftUp();
     }
     else if ( ev.MiddleDown() || ev.MiddleUp() || ev.MiddleDClick() )
     {

-        button = _T("Middle");
+        button = wxT("Middle");

         dbl = ev.MiddleDClick();
         up = ev.MiddleUp();
     }
     else if ( ev.RightDown() || ev.RightUp() || ev.RightDClick() )
     {
         dbl = ev.MiddleDClick();
         up = ev.MiddleUp();
     }
     else if ( ev.RightDown() || ev.RightUp() || ev.RightDClick() )
     {

-        button = _T("Right");
+        button = wxT("Right");

         dbl = ev.RightDClick();
         up = ev.RightUp();
     }
         dbl = ev.RightDClick();
         up = ev.RightUp();
     }

+    else if ( ev.Aux1Down() || ev.Aux1Up() || ev.Aux1DClick() )
+    {
+        button = wxT("Aux1");
+        dbl = ev.Aux1DClick();
+        up = ev.Aux1Up();
+    }
+    else if ( ev.Aux2Down() || ev.Aux2Up() || ev.Aux2DClick() )
+    {
+        button = wxT("Aux2");
+        dbl = ev.Aux2DClick();
+        up = ev.Aux2Up();
+    }
+    else if ( ev.GetWheelRotation() )
+    {
+        return wxString::Format("Wheel rotation %+d", ev.GetWheelRotation());
+    }

     else
     {
     else
     {

-        return _T("Unknown mouse event");
+        return wxT("Unknown mouse event");

     }
     }

+    wxASSERT(!(dbl && up));

 
 

-    return wxString::Format(_T("%s mouse button %s"),
+    return wxString::Format(wxT("%s mouse button %s"),

                             button.c_str(),
                             button.c_str(),

-                            dbl ? _T("double clicked")
-                                : up ? _T("released") : _T("clicked"));
+                            dbl ? wxT("double clicked")
+                                : up ? wxT("released") : wxT("clicked"));

 }
 
 void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)
 }
 
 void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)


@@ -705,35 +780,37 @@ void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)
         wxString msg;
         if ( ev.Entering() )
         {
         wxString msg;
         if ( ev.Entering() )
         {

-            msg = _T("Mouse entered the window");
+            msg = wxT("Mouse entered the window");

         }
         else if ( ev.Leaving() )
         {
         }
         else if ( ev.Leaving() )
         {

-            msg = _T("Mouse left the window");
+            msg = wxT("Mouse left the window");

         }
         else
         {
             msg = GetMouseEventDesc(ev);
         }
 
         }
         else
         {
             msg = GetMouseEventDesc(ev);
         }
 

-        msg << _T(" at (") << ev.GetX() << _T(", ") << ev.GetY() << _T(") ");
+        msg << wxT(" at (") << ev.GetX() << wxT(", ") << ev.GetY() << wxT(") ");

 
         long pos;
         wxTextCtrlHitTestResult rc = HitTest(ev.GetPosition(), &pos);
         if ( rc != wxTE_HT_UNKNOWN )
         {
 
         long pos;
         wxTextCtrlHitTestResult rc = HitTest(ev.GetPosition(), &pos);
         if ( rc != wxTE_HT_UNKNOWN )
         {

-            msg << _T("at position ") << pos << _T(' ');
+            msg << wxT("at position ") << pos << wxT(' ');

         }
 
         }
 

-        msg << _T("[Flags: ")
-            << GetChar( ev.LeftIsDown(), _T('1') )
-            << GetChar( ev.MiddleIsDown(), _T('2') )
-            << GetChar( ev.RightIsDown(), _T('3') )
-            << GetChar( ev.ControlDown(), _T('C') )
-            << GetChar( ev.AltDown(), _T('A') )
-            << GetChar( ev.ShiftDown(), _T('S') )
-            << GetChar( ev.MetaDown(), _T('M') )
-            << _T(']');
+        msg << wxT("[Flags: ")
+            << GetChar( ev.LeftIsDown(), wxT('1') )
+            << GetChar( ev.MiddleIsDown(), wxT('2') )
+            << GetChar( ev.RightIsDown(), wxT('3') )
+            << GetChar( ev.Aux1IsDown(), wxT('x') )
+            << GetChar( ev.Aux2IsDown(), wxT('X') )
+            << GetChar( ev.ControlDown(), wxT('C') )
+            << GetChar( ev.AltDown(), wxT('A') )
+            << GetChar( ev.ShiftDown(), wxT('S') )
+            << GetChar( ev.MetaDown(), wxT('M') )
+            << wxT(']');

 
         wxLogMessage(msg);
     }
 
         wxLogMessage(msg);
     }


@@ -743,7 +820,9 @@ void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)
 void MyTextCtrl::OnSetFocus(wxFocusEvent& event)
 {
     if ( ms_logFocus )
 void MyTextCtrl::OnSetFocus(wxFocusEvent& event)
 {
     if ( ms_logFocus )

+    {

         wxLogMessage( wxT("%p got focus."), this);
         wxLogMessage( wxT("%p got focus."), this);

+    }

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -751,12 +830,33 @@ void MyTextCtrl::OnSetFocus(wxFocusEvent& event)
 void MyTextCtrl::OnKillFocus(wxFocusEvent& event)
 {
     if ( ms_logFocus )
 void MyTextCtrl::OnKillFocus(wxFocusEvent& event)
 {
     if ( ms_logFocus )

+    {

         wxLogMessage( wxT("%p lost focus"), this);
         wxLogMessage( wxT("%p lost focus"), this);

+    }

 
     event.Skip();
 }
 
 void MyTextCtrl::OnText(wxCommandEvent& event)
 
     event.Skip();
 }
 
 void MyTextCtrl::OnText(wxCommandEvent& event)

+{
+    if ( !ms_logText )
+        return;
+
+    MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject();
+    const wxChar *changeVerb = win->IsModified() ? wxT("changed")
+                                                 : wxT("set by program");
+    const wxChar *data = (const wxChar *)(win->GetClientData());
+    if ( data )
+    {
+        wxLogMessage(wxT("Text %s in control \"%s\""), changeVerb, data);
+    }
+    else
+    {
+        wxLogMessage(wxT("Text %s in some control"), changeVerb);
+    }
+}
+
+void MyTextCtrl::OnTextEnter(wxCommandEvent& event)

 {
     if ( !ms_logText )
         return;
 {
     if ( !ms_logText )
         return;


@@ -765,20 +865,52 @@ void MyTextCtrl::OnText(wxCommandEvent& event)
     const wxChar *data = (const wxChar *)(win->GetClientData());
     if ( data )
     {
     const wxChar *data = (const wxChar *)(win->GetClientData());
     if ( data )
     {

-        wxLogMessage(_T("Text changed in control '%s'"), data);
+        wxLogMessage(wxT("Enter pressed in control '%s'"), data);

     }
     else
     {
     }
     else
     {

-        // wxLogMessage( event.GetString() );
-        wxLogMessage(_T("Text changed in some control"));
+        wxLogMessage(wxT("Enter pressed in some control"));

     }
 }
 
 void MyTextCtrl::OnTextMaxLen(wxCommandEvent& WXUNUSED(event))
 {
     }
 }
 
 void MyTextCtrl::OnTextMaxLen(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogMessage(_T("You can't enter more characters into this control."));
+    wxLogMessage(wxT("You can't enter more characters into this control."));
+}
+
+
+void MyTextCtrl::OnTextCut(wxClipboardTextEvent& event)
+{
+    LogClipEvent(wxT("cut to"), event);
+}
+
+void MyTextCtrl::OnTextCopy(wxClipboardTextEvent& event)
+{
+    LogClipEvent(wxT("copied to"), event);

 }
 
 }
 

+void MyTextCtrl::OnTextPaste(wxClipboardTextEvent& event)
+{
+    LogClipEvent(wxT("pasted from"), event);
+}
+
+void MyTextCtrl::LogClipEvent(const wxChar *what, wxClipboardTextEvent& event)
+{
+    wxFrame *frame = wxDynamicCast(wxGetTopLevelParent(this), wxFrame);
+    wxCHECK_RET( frame, wxT("no parent frame?") );
+
+    const bool veto = frame->GetMenuBar()->IsChecked(TEXT_CLIPBOARD_VETO);
+    if ( !veto )
+        event.Skip();
+
+    if ( ms_logClip )
+    {
+        wxLogMessage(wxT("Text %s%s the clipboard."),
+                     veto ? wxT("not ") : wxT(""), what);
+    }
+}
+
+

 void MyTextCtrl::OnTextURL(wxTextUrlEvent& event)
 {
     const wxMouseEvent& ev = event.GetMouseEvent();
 void MyTextCtrl::OnTextURL(wxTextUrlEvent& event)
 {
     const wxMouseEvent& ev = event.GetMouseEvent();


@@ -790,7 +922,7 @@ void MyTextCtrl::OnTextURL(wxTextUrlEvent& event)
     long start = event.GetURLStart(),
          end = event.GetURLEnd();
 
     long start = event.GetURLStart(),
          end = event.GetURLEnd();
 

-    wxLogMessage(_T("Mouse event over URL '%s': %s"),
+    wxLogMessage(wxT("Mouse event over URL '%s': %s"),

                  GetValue().Mid(start, end - start).c_str(),
                  GetMouseEventDesc(ev).c_str());
 }
                  GetValue().Mid(start, end - start).c_str(),
                  GetMouseEventDesc(ev).c_str());
 }


@@ -798,7 +930,7 @@ void MyTextCtrl::OnTextURL(wxTextUrlEvent& event)
 void MyTextCtrl::OnChar(wxKeyEvent& event)
 {
     if ( ms_logChar )
 void MyTextCtrl::OnChar(wxKeyEvent& event)
 {
     if ( ms_logChar )

-        LogKeyEvent( _T("Char"), event);
+        LogKeyEvent( wxT("Char"), event);

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -806,7 +938,7 @@ void MyTextCtrl::OnChar(wxKeyEvent& event)
 void MyTextCtrl::OnKeyUp(wxKeyEvent& event)
 {
     if ( ms_logKey )
 void MyTextCtrl::OnKeyUp(wxKeyEvent& event)
 {
     if ( ms_logKey )

-        LogKeyEvent( _T("Key up"), event);
+        LogKeyEvent( wxT("Key up"), event);

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -821,7 +953,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
                 long line, column, pos = GetInsertionPoint();
                 PositionToXY(pos, &column, &line);
 
                 long line, column, pos = GetInsertionPoint();
                 PositionToXY(pos, &column, &line);
 

-                wxLogMessage(_T("Current position: %ld\nCurrent line, column: (%ld, %ld)\nNumber of lines: %ld\nCurrent line length: %ld\nTotal text length: %u (%ld)"),
+                wxLogMessage(wxT("Current position: %ld\nCurrent line, column: (%ld, %ld)\nNumber of lines: %ld\nCurrent line length: %ld\nTotal text length: %u (%ld)"),

                         pos,
                         line, column,
                         (long) GetNumberOfLines(),
                         pos,
                         line, column,
                         (long) GetNumberOfLines(),


@@ -834,10 +966,14 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
 
                 wxString sel = GetStringSelection();
 
 
                 wxString sel = GetStringSelection();
 

-                wxLogMessage(_T("Selection: from %ld to %ld."), from, to);
-                wxLogMessage(_T("Selection = '%s' (len = %u)"),
+                wxLogMessage(wxT("Selection: from %ld to %ld."), from, to);
+                wxLogMessage(wxT("Selection = '%s' (len = %u)"),

                              sel.c_str(),
                              (unsigned int) sel.length());
                              sel.c_str(),
                              (unsigned int) sel.length());

+
+                const wxString text = GetLineText(line);
+                wxLogMessage(wxT("Current line: \"%s\"; length = %lu"),
+                             text.c_str(), text.length());

             }
             break;
 
             }
             break;
 


@@ -868,33 +1004,38 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
 
         case WXK_F5:
             // insert a blank line
 
         case WXK_F5:
             // insert a blank line

-            WriteText(_T("\n"));
+            WriteText(wxT("\n"));

             break;
 
         case WXK_F6:
             break;
 
         case WXK_F6:

-            wxLogMessage(_T("IsModified() before SetValue(): %d"),
+            wxLogMessage(wxT("IsModified() before SetValue(): %d"),

                          IsModified());
                          IsModified());

-            SetValue(_T("SetValue() has been called"));
-            wxLogMessage(_T("IsModified() after SetValue(): %d"),
+            ChangeValue(wxT("ChangeValue() has been called"));
+            wxLogMessage(wxT("IsModified() after SetValue(): %d"),

                          IsModified());
             break;
 
         case WXK_F7:
                          IsModified());
             break;
 
         case WXK_F7:

-            wxLogMessage(_T("Position 10 should be now visible."));
+            wxLogMessage(wxT("Position 10 should be now visible."));

             ShowPosition(10);
             break;
 
         case WXK_F8:
             ShowPosition(10);
             break;
 
         case WXK_F8:

-            wxLogMessage(_T("Control has been cleared"));
+            wxLogMessage(wxT("Control has been cleared"));

             Clear();
             break;
 
         case WXK_F9:
             Clear();
             break;
 
         case WXK_F9:

-            WriteText(_T("WriteText() has been called"));
+            WriteText(wxT("WriteText() has been called"));

             break;
 
         case WXK_F10:
             break;
 
         case WXK_F10:

-            AppendText(_T("AppendText() has been called"));
+            AppendText(wxT("AppendText() has been called"));
+            break;
+
+        case WXK_F11:
+            DiscardEdits();
+            wxLogMessage(wxT("Control marked as non modified"));

             break;
     }
 
             break;
     }
 


@@ -912,61 +1053,68 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
        : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) )
 {
 #if wxUSE_LOG
        : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) )
 {
 #if wxUSE_LOG

-    m_log = new wxTextCtrl( this, wxID_ANY, _T("This is the log window.\n"),
+    m_log = new wxTextCtrl( this, wxID_ANY, wxT("This is the log window.\n"),

                             wxPoint(5,260), wxSize(630,100),
                             wxPoint(5,260), wxSize(630,100),

-                            wxTE_MULTILINE | wxTE_READONLY /* | wxTE_RICH */);
+                            wxTE_MULTILINE | wxTE_READONLY);

 
     m_logOld = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
 #endif // wxUSE_LOG
 
     // single line text controls
 
 
     m_logOld = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
 #endif // wxUSE_LOG
 
     // single line text controls
 

-    m_text = new MyTextCtrl( this, wxID_ANY, _T("Single line."),
+    m_text = new MyTextCtrl( this, wxID_ANY, wxT("Single line."),

                              wxDefaultPosition, wxDefaultSize,
                              wxTE_PROCESS_ENTER);
     m_text->SetForegroundColour(*wxBLUE);
     m_text->SetBackgroundColour(*wxLIGHT_GREY);
                              wxDefaultPosition, wxDefaultSize,
                              wxTE_PROCESS_ENTER);
     m_text->SetForegroundColour(*wxBLUE);
     m_text->SetBackgroundColour(*wxLIGHT_GREY);

-    (*m_text) << _T(" Appended.");
+    (*m_text) << wxT(" Appended.");

     m_text->SetInsertionPoint(0);
     m_text->SetInsertionPoint(0);

-    m_text->WriteText( _T("Prepended. ") );
+    m_text->WriteText( wxT("Prepended. ") );

 
 

-    m_password = new MyTextCtrl( this, wxID_ANY, _T(""),
+    m_password = new MyTextCtrl( this, wxID_ANY, wxT(""),

       wxPoint(10,50), wxSize(140,wxDefaultCoord), wxTE_PASSWORD );
 
       wxPoint(10,50), wxSize(140,wxDefaultCoord), wxTE_PASSWORD );
 

-    m_readonly = new MyTextCtrl( this, wxID_ANY, _T("Read only"),
-      wxPoint(10,90), wxSize(140,wxDefaultCoord), wxTE_READONLY );
-
-    m_limited = new MyTextCtrl(this, wxID_ANY, _T("Max 8 ch"),
-                              wxPoint(10, 130), wxSize(140, wxDefaultCoord));
+    m_limited = new MyTextCtrl(this, wxID_ANY, "",
+                              wxPoint(10, 90), wxDefaultSize);
+    m_limited->SetHint("Max 8 ch");

     m_limited->SetMaxLength(8);
     m_limited->SetMaxLength(8);

+    wxSize size2 = m_limited->GetSizeFromTextSize(m_limited->GetTextExtent("WWWWWWWW"));
+    m_limited->SetSizeHints(size2, size2);

 
     // multi line text controls
 
 
     // multi line text controls
 

-    m_horizontal = new MyTextCtrl( this, wxID_ANY, _T("Multiline text control with a horizontal scrollbar.\n"),
+    wxString string3L("Read only\nMultiline\nFitted size");
+    m_readonly = new MyTextCtrl( this, wxID_ANY, string3L,
+               wxPoint(10, 120), wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY );
+    wxWindowDC dc(m_readonly);
+    size2 = m_readonly->GetSizeFromTextSize(dc.GetMultiLineTextExtent(string3L));
+    m_readonly->SetMinSize(size2);
+
+    m_horizontal = new MyTextCtrl( this, wxID_ANY, wxT("Multiline text control with a horizontal scrollbar.\n"),

       wxPoint(10,170), wxSize(140,70), wxTE_MULTILINE | wxHSCROLL);
 
     // a little hack to use the command line argument for encoding testing
     if ( wxTheApp->argc == 2 )
     {
       wxPoint(10,170), wxSize(140,70), wxTE_MULTILINE | wxHSCROLL);
 
     // a little hack to use the command line argument for encoding testing
     if ( wxTheApp->argc == 2 )
     {

-        switch ( wxTheApp->argv[1][0] )
+        switch ( (wxChar)wxTheApp->argv[1][0] )

         {
             case '2':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
         {
             case '2':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,

-                                             false, _T(""),
+                                             false, wxT(""),

                                              wxFONTENCODING_ISO8859_2));
                                              wxFONTENCODING_ISO8859_2));

-                m_horizontal->AppendText(_T("\256lu\273ou\350k\375 k\371\362 zb\354sile \350e\271tina \253\273"));
+                m_horizontal->AppendText(wxT("\256lu\273ou\350k\375 k\371\362 zb\354sile \350e\271tina \253\273"));

                 break;
 
             case '1':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                 break;
 
             case '1':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,

-                                             false, _T(""),
+                                             false, wxT(""),

                                              wxFONTENCODING_CP1251));
                                              wxFONTENCODING_CP1251));

-                m_horizontal->AppendText(_T("\317\360\350\342\345\362!"));
+                m_horizontal->AppendText(wxT("\317\360\350\342\345\362!"));

                 break;
 
             case '8':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,
                 break;
 
             case '8':
                 m_horizontal->SetFont(wxFont(18, wxSWISS, wxNORMAL, wxNORMAL,

-                                             false, _T(""),
+                                             false, wxT(""),

                                              wxFONTENCODING_CP1251));
 #if wxUSE_UNICODE
                 m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426");
                                              wxFONTENCODING_CP1251));
 #if wxUSE_UNICODE
                 m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426");


@@ -977,37 +1125,38 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     }
     else
     {
     }
     else
     {

-        m_horizontal->AppendText(_T("Text in default encoding"));
+        m_horizontal->AppendText(wxT("Text in default encoding"));

     }
 
     }
 

-    m_multitext = new MyTextCtrl( this, wxID_ANY, _T("Multi line."),
-      wxPoint(180,10), wxSize(200,70), wxTE_MULTILINE );
+    m_multitext = new MyTextCtrl( this, wxID_ANY,
+                                  wxT("Multi line without vertical scrollbar."),
+      wxPoint(180,10), wxSize(200,70), wxTE_MULTILINE | wxTE_NO_VSCROLL );

     m_multitext->SetFont(*wxITALIC_FONT);
     m_multitext->SetFont(*wxITALIC_FONT);

-    (*m_multitext) << _T(" Appended.");
+    (*m_multitext) << wxT(" Appended.");

     m_multitext->SetInsertionPoint(0);
     m_multitext->SetInsertionPoint(0);

-    m_multitext->WriteText( _T("Prepended. ") );
-    m_multitext->SetForegroundColour(*wxRED);
+    m_multitext->WriteText( wxT("Prepended. ") );
+    m_multitext->SetForegroundColour(*wxYELLOW);

     m_multitext->SetBackgroundColour(*wxLIGHT_GREY);
 
 #if wxUSE_TOOLTIPS
     m_multitext->SetBackgroundColour(*wxLIGHT_GREY);
 
 #if wxUSE_TOOLTIPS

-    m_multitext->SetToolTip(_T("Press Fn function keys here"));
+    m_multitext->SetToolTip(wxT("Press Fn function keys here"));

 #endif
 
 #endif
 

-    m_tab = new MyTextCtrl( this, 100, _T("Multiline, allow <TAB> processing."),
-      wxPoint(180,90), wxSize(200,70), wxTE_MULTILINE |  wxTE_PROCESS_TAB );
-    m_tab->SetClientData((void *)_T("tab"));
+    m_tab = new MyTextCtrl( this, 100, wxT("Multiline, allow <TAB> processing."),
+      wxPoint(180,90), wxDefaultSize, wxTE_MULTILINE |  wxTE_PROCESS_TAB );
+    m_tab->SetClientData((void *)wxT("tab"));

 
 

-    m_enter = new MyTextCtrl( this, 100, _T("Multiline, allow <ENTER> processing."),
+    m_enter = new MyTextCtrl( this, 100, wxT("Multiline, allow <ENTER> processing."),

       wxPoint(180,170), wxSize(200,70), wxTE_MULTILINE);
       wxPoint(180,170), wxSize(200,70), wxTE_MULTILINE);

-    m_enter->SetClientData((void *)_T("enter"));
-
-    m_textrich = new MyTextCtrl(this, wxID_ANY, _T("Allows more than 30Kb of text\n")
-                                _T("(even under broken Win9x)\n")
-                                _T("and a very very very very very ")
-                                _T("very very very long line to test ")
-                                _T("wxHSCROLL style\n")
-                                _T("\nAnd here is a link in quotation marks to ")
-                                _T("test wxTE_AUTO_URL: \"http://www.wxwidgets.org\""),
+    m_enter->SetClientData((void *)wxT("enter"));
+
+    m_textrich = new MyTextCtrl(this, wxID_ANY, wxT("Allows more than 30Kb of text\n")
+                                wxT("(even under broken Win9x)\n")
+                                wxT("and a very very very very very ")
+                                wxT("very very very long line to test ")
+                                wxT("wxHSCROLL style\n")
+                                wxT("\nAnd here is a link in quotation marks to ")
+                                wxT("test wxTE_AUTO_URL: \"http://www.wxwidgets.org\""),

                                 wxPoint(450, 10), wxSize(200, 230),
                                 wxTE_RICH | wxTE_MULTILINE | wxTE_AUTO_URL);
     m_textrich->SetStyle(0, 10, *wxRED);
                                 wxPoint(450, 10), wxSize(200, 230),
                                 wxTE_RICH | wxTE_MULTILINE | wxTE_AUTO_URL);
     m_textrich->SetStyle(0, 10, *wxRED);


@@ -1015,28 +1164,28 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_textrich->SetStyle(30, 40,
                          wxTextAttr(*wxGREEN, wxNullColour, *wxITALIC_FONT));
     m_textrich->SetDefaultStyle(wxTextAttr());
     m_textrich->SetStyle(30, 40,
                          wxTextAttr(*wxGREEN, wxNullColour, *wxITALIC_FONT));
     m_textrich->SetDefaultStyle(wxTextAttr());

-    m_textrich->AppendText(_T("\n\nFirst 10 characters should be in red\n"));
-    m_textrich->AppendText(_T("Next 10 characters should be in blue\n"));
-    m_textrich->AppendText(_T("Next 10 characters should be normal\n"));
-    m_textrich->AppendText(_T("And the next 10 characters should be green and italic\n"));
+    m_textrich->AppendText(wxT("\n\nFirst 10 characters should be in red\n"));
+    m_textrich->AppendText(wxT("Next 10 characters should be in blue\n"));
+    m_textrich->AppendText(wxT("Next 10 characters should be normal\n"));
+    m_textrich->AppendText(wxT("And the next 10 characters should be green and italic\n"));

     m_textrich->SetDefaultStyle(wxTextAttr(*wxCYAN, *wxBLUE));
     m_textrich->SetDefaultStyle(wxTextAttr(*wxCYAN, *wxBLUE));

-    m_textrich->AppendText(_T("This text should be cyan on blue\n"));
+    m_textrich->AppendText(wxT("This text should be cyan on blue\n"));

     m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE, *wxWHITE));
     m_textrich->SetDefaultStyle(wxTextAttr(*wxBLUE, *wxWHITE));

-    m_textrich->AppendText(_T("And this should be in blue and the text you ")
-                           _T("type should be in blue as well"));
+    m_textrich->AppendText(wxT("And this should be in blue and the text you ")
+                           wxT("type should be in blue as well"));

 
 
     // lay out the controls
     wxBoxSizer *column1 = new wxBoxSizer(wxVERTICAL);
     column1->Add( m_text, 0, wxALL | wxEXPAND, 10 );
     column1->Add( m_password, 0, wxALL | wxEXPAND, 10 );
 
 
     // lay out the controls
     wxBoxSizer *column1 = new wxBoxSizer(wxVERTICAL);
     column1->Add( m_text, 0, wxALL | wxEXPAND, 10 );
     column1->Add( m_password, 0, wxALL | wxEXPAND, 10 );

-    column1->Add( m_readonly, 0, wxALL | wxEXPAND, 10 );
-    column1->Add( m_limited, 0, wxALL | wxEXPAND, 10 );
+    column1->Add( m_readonly, 0, wxALL, 10 );
+    column1->Add( m_limited, 0, wxALL, 10 );

     column1->Add( m_horizontal, 1, wxALL | wxEXPAND, 10 );
 
     wxBoxSizer *column2 = new wxBoxSizer(wxVERTICAL);
     column2->Add( m_multitext, 1, wxALL | wxEXPAND, 10 );
     column1->Add( m_horizontal, 1, wxALL | wxEXPAND, 10 );
 
     wxBoxSizer *column2 = new wxBoxSizer(wxVERTICAL);
     column2->Add( m_multitext, 1, wxALL | wxEXPAND, 10 );

-    column2->Add( m_tab, 1, wxALL | wxEXPAND, 10 );
+    column2->Add( m_tab, 0, wxALL | wxEXPAND, 10 );

     column2->Add( m_enter, 1, wxALL | wxEXPAND, 10 );
 
     wxBoxSizer *row1 = new wxBoxSizer(wxHORIZONTAL);
     column2->Add( m_enter, 1, wxALL | wxEXPAND, 10 );
 
     wxBoxSizer *row1 = new wxBoxSizer(wxHORIZONTAL);


@@ -1051,7 +1200,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     topSizer->Add( m_log, 1, wxALL | wxEXPAND, 10 );
 #endif
 
     topSizer->Add( m_log, 1, wxALL | wxEXPAND, 10 );
 #endif
 

-    SetAutoLayout( true );

     SetSizer(topSizer);
 }
 
     SetSizer(topSizer);
 }
 


@@ -1074,14 +1222,14 @@ void MyPanel::DoPasteFromClipboard()
     if (!wxTheClipboard->Open())
     {
 #if wxUSE_LOG
     if (!wxTheClipboard->Open())
     {
 #if wxUSE_LOG

-        *m_log << _T("Error opening the clipboard.\n");
+        *m_log << wxT("Error opening the clipboard.\n");

 #endif // wxUSE_LOG
         return;
     }
     else
     {
 #if wxUSE_LOG
 #endif // wxUSE_LOG
         return;
     }
     else
     {
 #if wxUSE_LOG

-        *m_log << _T("Successfully opened the clipboard.\n");
+        *m_log << wxT("Successfully opened the clipboard.\n");

 #endif // wxUSE_LOG
     }
 
 #endif // wxUSE_LOG
     }
 


@@ -1090,34 +1238,34 @@ void MyPanel::DoPasteFromClipboard()
     if (wxTheClipboard->IsSupported( data.GetFormat() ))
     {
 #if wxUSE_LOG
     if (wxTheClipboard->IsSupported( data.GetFormat() ))
     {
 #if wxUSE_LOG

-        *m_log << _T("Clipboard supports requested format.\n");
+        *m_log << wxT("Clipboard supports requested format.\n");

 #endif // wxUSE_LOG
 
         if (wxTheClipboard->GetData( data ))
         {
 #if wxUSE_LOG
 #endif // wxUSE_LOG
 
         if (wxTheClipboard->GetData( data ))
         {
 #if wxUSE_LOG

-            *m_log << _T("Successfully retrieved data from the clipboard.\n");
+            *m_log << wxT("Successfully retrieved data from the clipboard.\n");

 #endif // wxUSE_LOG
             GetFocusedText()->AppendText(data.GetText());
         }
         else
         {
 #if wxUSE_LOG
 #endif // wxUSE_LOG
             GetFocusedText()->AppendText(data.GetText());
         }
         else
         {
 #if wxUSE_LOG

-            *m_log << _T("Error getting data from the clipboard.\n");
+            *m_log << wxT("Error getting data from the clipboard.\n");

 #endif // wxUSE_LOG
         }
     }
     else
     {
 #if wxUSE_LOG
 #endif // wxUSE_LOG
         }
     }
     else
     {
 #if wxUSE_LOG

-        *m_log << _T("Clipboard doesn't support requested format.\n");
+        *m_log << wxT("Clipboard doesn't support requested format.\n");

 #endif // wxUSE_LOG
     }
 
     wxTheClipboard->Close();
 
 #if wxUSE_LOG
 #endif // wxUSE_LOG
     }
 
     wxTheClipboard->Close();
 
 #if wxUSE_LOG

-    *m_log << _T("Closed the clipboard.\n");
+    *m_log << wxT("Closed the clipboard.\n");

 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG
 }
 


@@ -1133,7 +1281,7 @@ void MyPanel::DoCopyToClipboard()
     if (text.IsEmpty())
     {
 #if wxUSE_LOG
     if (text.IsEmpty())
     {
 #if wxUSE_LOG

-        *m_log << _T("No text to copy.\n");
+        *m_log << wxT("No text to copy.\n");

 #endif // wxUSE_LOG
 
         return;
 #endif // wxUSE_LOG
 
         return;


@@ -1142,7 +1290,7 @@ void MyPanel::DoCopyToClipboard()
     if (!wxTheClipboard->Open())
     {
 #if wxUSE_LOG
     if (!wxTheClipboard->Open())
     {
 #if wxUSE_LOG

-        *m_log << _T("Error opening the clipboard.\n");
+        *m_log << wxT("Error opening the clipboard.\n");

 #endif // wxUSE_LOG
 
         return;
 #endif // wxUSE_LOG
 
         return;


@@ -1150,7 +1298,7 @@ void MyPanel::DoCopyToClipboard()
     else
     {
 #if wxUSE_LOG
     else
     {
 #if wxUSE_LOG

-        *m_log << _T("Successfully opened the clipboard.\n");
+        *m_log << wxT("Successfully opened the clipboard.\n");

 #endif // wxUSE_LOG
     }
 
 #endif // wxUSE_LOG
     }
 


@@ -1159,20 +1307,20 @@ void MyPanel::DoCopyToClipboard()
     if (!wxTheClipboard->SetData( data ))
     {
 #if wxUSE_LOG
     if (!wxTheClipboard->SetData( data ))
     {
 #if wxUSE_LOG

-        *m_log << _T("Error while copying to the clipboard.\n");
+        *m_log << wxT("Error while copying to the clipboard.\n");

 #endif // wxUSE_LOG
     }
     else
     {
 #if wxUSE_LOG
 #endif // wxUSE_LOG
     }
     else
     {
 #if wxUSE_LOG

-        *m_log << _T("Successfully copied data to the clipboard.\n");
+        *m_log << wxT("Successfully copied data to the clipboard.\n");

 #endif // wxUSE_LOG
     }
 
     wxTheClipboard->Close();
 
 #if wxUSE_LOG
 #endif // wxUSE_LOG
     }
 
     wxTheClipboard->Close();
 
 #if wxUSE_LOG

-    *m_log << _T("Closed the clipboard.\n");
+    *m_log << wxT("Closed the clipboard.\n");

 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG
 }
 


@@ -1184,6 +1332,18 @@ void MyPanel::DoMoveToEndOfText()
     m_multitext->SetFocus();
 }
 
     m_multitext->SetFocus();
 }
 

+void MyPanel::DoGetWindowCoordinates()
+{
+    wxTextCtrl * const text = GetFocusedText();
+
+    const wxPoint pt0 = text->PositionToCoords(0);
+    const wxPoint ptCur = text->PositionToCoords(text->GetInsertionPoint());
+    *m_log << "Current position coordinates: "
+              "(" << ptCur.x << ", "  << ptCur.y << "), "
+              "first position coordinates: "
+              "(" << pt0.x << ", "  << pt0.y << ")\n";
+}
+

 void MyPanel::DoMoveToEndOfEntry()
 {
     m_text->SetInsertionPointEnd();
 void MyPanel::DoMoveToEndOfEntry()
 {
     m_text->SetInsertionPointEnd();


@@ -1197,7 +1357,7 @@ void MyPanel::DoRemoveText()
 
 void MyPanel::DoReplaceText()
 {
 
 void MyPanel::DoReplaceText()
 {

-    GetFocusedText()->Replace(3, 8, _T("ABC"));
+    GetFocusedText()->Replace(3, 8, wxT("ABC"));

 }
 
 void MyPanel::DoSelectText()
 }
 
 void MyPanel::DoSelectText()


@@ -1221,6 +1381,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEXT_LOG_MOUSE,MyFrame::OnLogMouse)
     EVT_MENU(TEXT_LOG_TEXT, MyFrame::OnLogText)
     EVT_MENU(TEXT_LOG_FOCUS,MyFrame::OnLogFocus)
     EVT_MENU(TEXT_LOG_MOUSE,MyFrame::OnLogMouse)
     EVT_MENU(TEXT_LOG_TEXT, MyFrame::OnLogText)
     EVT_MENU(TEXT_LOG_FOCUS,MyFrame::OnLogFocus)

+    EVT_MENU(TEXT_LOG_CLIP, MyFrame::OnLogClip)

 #if wxUSE_LOG
     EVT_MENU(TEXT_CLEAR,    MyFrame::OnLogClear)
 #endif // wxUSE_LOG
 #if wxUSE_LOG
     EVT_MENU(TEXT_CLEAR,    MyFrame::OnLogClear)
 #endif // wxUSE_LOG


@@ -1243,7 +1404,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEXT_SELECT,             MyFrame::OnSelectText)
     EVT_MENU(TEXT_ADD_SOME,           MyFrame::OnAddText)
     EVT_MENU(TEXT_ADD_FREEZE,         MyFrame::OnAddTextFreeze)
     EVT_MENU(TEXT_SELECT,             MyFrame::OnSelectText)
     EVT_MENU(TEXT_ADD_SOME,           MyFrame::OnAddText)
     EVT_MENU(TEXT_ADD_FREEZE,         MyFrame::OnAddTextFreeze)

+    EVT_MENU(TEXT_ADD_LINE,           MyFrame::OnAddTextLine)

     EVT_MENU(TEXT_MOVE_ENDTEXT,       MyFrame::OnMoveToEndOfText)
     EVT_MENU(TEXT_MOVE_ENDTEXT,       MyFrame::OnMoveToEndOfText)

+    EVT_MENU(TEXT_GET_WINDOW_COORD,   MyFrame::OnGetWindowCoordinates)

     EVT_MENU(TEXT_MOVE_ENDENTRY,      MyFrame::OnMoveToEndOfEntry)
 
     EVT_MENU(TEXT_SET_EDITABLE,       MyFrame::OnSetEditable)
     EVT_MENU(TEXT_MOVE_ENDENTRY,      MyFrame::OnMoveToEndOfEntry)
 
     EVT_MENU(TEXT_SET_EDITABLE,       MyFrame::OnSetEditable)


@@ -1254,10 +1417,11 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEXT_PAGE_DOWN,          MyFrame::OnScrollPageDown)
     EVT_MENU(TEXT_PAGE_UP,            MyFrame::OnScrollPageUp)
 
     EVT_MENU(TEXT_PAGE_DOWN,          MyFrame::OnScrollPageDown)
     EVT_MENU(TEXT_PAGE_UP,            MyFrame::OnScrollPageUp)
 

-    EVT_MENU(TEXT_GET_LINE,            MyFrame::OnGetLine)
-    EVT_MENU(TEXT_GET_LINELENGTH,            MyFrame::OnGetLineLength)
+    EVT_MENU(TEXT_GET_LINE,           MyFrame::OnGetLine)
+    EVT_MENU(TEXT_GET_LINELENGTH,     MyFrame::OnGetLineLength)

 
     EVT_MENU(TEXT_SET,                MyFrame::OnSetText)
 
     EVT_MENU(TEXT_SET,                MyFrame::OnSetText)

+    EVT_MENU(TEXT_CHANGE,             MyFrame::OnChangeText)

 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()


@@ -1265,6 +1429,8 @@ END_EVENT_TABLE()
 MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
        : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h) )
 {
 MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
        : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h) )
 {

+    SetIcon(wxICON(sample));
+

 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR


@@ -1282,12 +1448,12 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
     wxBeginBusyCursor();
 
     wxMessageDialog dialog(this,
     wxBeginBusyCursor();
 
     wxMessageDialog dialog(this,

-      _T("This is a text control sample. It demonstrates the many different\n")
-      _T("text control styles, the use of the clipboard, setting and handling\n")
-      _T("tooltips and intercepting key and char events.\n")
-      _T("\n")
-        _T("Copyright (c) 1999, Robert Roebling, Julian Smart, Vadim Zeitlin"),
-        _T("About wxTextCtrl Sample"),
+      wxT("This is a text control sample. It demonstrates the many different\n")
+      wxT("text control styles, the use of the clipboard, setting and handling\n")
+      wxT("tooltips and intercepting key and char events.\n")
+      wxT("\n")
+        wxT("Copyright (c) 1999, Robert Roebling, Julian Smart, Vadim Zeitlin"),
+        wxT("About wxTextCtrl Sample"),

         wxOK | wxICON_INFORMATION);
 
     dialog.ShowModal();
         wxOK | wxICON_INFORMATION);
 
     dialog.ShowModal();


@@ -1302,20 +1468,20 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& WXUNUSED(event))
     static long s_delay = 5000;
 
     wxString delay;
     static long s_delay = 5000;
 
     wxString delay;

-    delay.Printf( _T("%ld"), s_delay);
+    delay.Printf( wxT("%ld"), s_delay);

 
 

-    delay = wxGetTextFromUser(_T("Enter delay (in milliseconds)"),
-                              _T("Set tooltip delay"),
+    delay = wxGetTextFromUser(wxT("Enter delay (in milliseconds)"),
+                              wxT("Set tooltip delay"),

                               delay,
                               this);
     if ( !delay )
         return; // cancelled
 
                               delay,
                               this);
     if ( !delay )
         return; // cancelled
 

-    wxSscanf(delay, _T("%ld"), &s_delay);
+    wxSscanf(delay, wxT("%ld"), &s_delay);

 
     wxToolTip::SetDelay(s_delay);
 
 
     wxToolTip::SetDelay(s_delay);
 

-    wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
+    wxLogStatus(this, wxT("Tooltip delay set to %ld milliseconds"), s_delay);

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


@@ -1326,7 +1492,7 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))
 
     wxToolTip::Enable(s_enabled);
 
 
     wxToolTip::Enable(s_enabled);
 

-    wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") );
+    wxLogStatus(this, wxT("Tooltips %sabled"), s_enabled ? wxT("en") : wxT("dis") );

 }
 #endif // tooltips
 
 }
 #endif // tooltips
 


@@ -1363,32 +1529,36 @@ void MyFrame::OnSetEnabled(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnFileSave(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnFileSave(wxCommandEvent& WXUNUSED(event))
 {

-    if ( m_panel->m_textrich->SaveFile(_T("dummy.txt")) )
+    if ( m_panel->m_textrich->SaveFile(wxT("dummy.txt")) )

     {
 #if wxUSE_FILE
         // verify that the fil length is correct (it wasn't under Win95)
         wxFile file(wxT("dummy.txt"));
         wxLogStatus(this,
     {
 #if wxUSE_FILE
         // verify that the fil length is correct (it wasn't under Win95)
         wxFile file(wxT("dummy.txt"));
         wxLogStatus(this,

-                    _T("Successfully saved file (text len = %lu, file size = %ld)"),
+                    wxT("Successfully saved file (text len = %lu, file size = %ld)"),

                     (unsigned long)m_panel->m_textrich->GetValue().length(),
                     (long) file.Length());
 #endif
     }
     else
                     (unsigned long)m_panel->m_textrich->GetValue().length(),
                     (long) file.Length());
 #endif
     }
     else

-        wxLogStatus(this, _T("Couldn't save the file"));
+        wxLogStatus(this, wxT("Couldn't save the file"));

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

-    if ( m_panel->m_textrich->LoadFile(_T("dummy.txt")) )
-        wxLogStatus(this, _T("Successfully loaded file"));
+    if ( m_panel->m_textrich->LoadFile(wxT("dummy.txt")) )
+    {
+        wxLogStatus(this, wxT("Successfully loaded file"));
+    }

     else
     else

-        wxLogStatus(this, _T("Couldn't load the file"));
+    {
+        wxLogStatus(this, wxT("Couldn't load the file"));
+    }

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

-    RichTextFrame* frame = new RichTextFrame(this, _T("Rich Text Editor"));
+    RichTextFrame* frame = new RichTextFrame(this, wxT("Rich Text Editor"));

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


@@ -1404,13 +1574,13 @@ void MyFrame::OnIdle( wxIdleEvent& event )
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__

-                _T("Focus: wxWindow = %p, HWND = %08x"),
+                wxT("Focus: wxWindow = %p, HWND = %p"),

 #else
 #else

-                _T("Focus: wxWindow = %p"),
+                wxT("Focus: wxWindow = %p"),

 #endif
                 s_windowFocus
 #ifdef __WXMSW__
 #endif
                 s_windowFocus
 #ifdef __WXMSW__

-                , (unsigned int) s_windowFocus->GetHWND()
+                , s_windowFocus->GetHWND()

 #endif
                   );
 
 #endif
                   );
 


@@ -1436,7 +1606,8 @@ enum
     RICHTEXT_CHANGE_TEXT_COLOUR,
     RICHTEXT_CHANGE_BACKGROUND_COLOUR,
     RICHTEXT_LEFT_INDENT,
     RICHTEXT_CHANGE_TEXT_COLOUR,
     RICHTEXT_CHANGE_BACKGROUND_COLOUR,
     RICHTEXT_LEFT_INDENT,

-    RICHTEXT_RIGHT_INDENT
+    RICHTEXT_RIGHT_INDENT,
+    RICHTEXT_TAB_STOPS

 };
 
 BEGIN_EVENT_TABLE(RichTextFrame, wxFrame)
 };
 
 BEGIN_EVENT_TABLE(RichTextFrame, wxFrame)


@@ -1451,6 +1622,7 @@ BEGIN_EVENT_TABLE(RichTextFrame, wxFrame)
     EVT_MENU(RICHTEXT_CHANGE_BACKGROUND_COLOUR, RichTextFrame::OnChangeBackgroundColour)
     EVT_MENU(RICHTEXT_LEFT_INDENT, RichTextFrame::OnLeftIndent)
     EVT_MENU(RICHTEXT_RIGHT_INDENT, RichTextFrame::OnRightIndent)
     EVT_MENU(RICHTEXT_CHANGE_BACKGROUND_COLOUR, RichTextFrame::OnChangeBackgroundColour)
     EVT_MENU(RICHTEXT_LEFT_INDENT, RichTextFrame::OnLeftIndent)
     EVT_MENU(RICHTEXT_RIGHT_INDENT, RichTextFrame::OnRightIndent)

+    EVT_MENU(RICHTEXT_TAB_STOPS, RichTextFrame::OnTabStops)

 END_EVENT_TABLE()
 
 RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title):
 END_EVENT_TABLE()
 
 RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title):


@@ -1489,7 +1661,8 @@ RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title):
     editMenu->Append(RICHTEXT_CHANGE_BACKGROUND_COLOUR, _("Change Background Colour"));
     editMenu->AppendSeparator();
     editMenu->Append(RICHTEXT_LEFT_INDENT, _("Left Indent"));
     editMenu->Append(RICHTEXT_CHANGE_BACKGROUND_COLOUR, _("Change Background Colour"));
     editMenu->AppendSeparator();
     editMenu->Append(RICHTEXT_LEFT_INDENT, _("Left Indent"));

-    editMenu->Append(RICHTEXT_RIGHT_INDENT, _("Right indent"));
+    editMenu->Append(RICHTEXT_RIGHT_INDENT, _("Right Indent"));
+    editMenu->Append(RICHTEXT_TAB_STOPS, _("Tab Stops"));

     menuBar->Append(editMenu, _("Edit"));
 
     SetMenuBar(menuBar);
     menuBar->Append(editMenu, _("Edit"));
 
     SetMenuBar(menuBar);


@@ -1587,7 +1760,7 @@ void RichTextFrame::OnChangeTextColour(wxCommandEvent& WXUNUSED(event))
     }
 
     wxColourDialog dialog(this, &data);
     }
 
     wxColourDialog dialog(this, &data);

-    dialog.SetTitle(_T("Choose the text colour"));
+    dialog.SetTitle(wxT("Choose the text colour"));

     if (dialog.ShowModal() == wxID_OK)
     {
         wxColourData retData = dialog.GetColourData();
     if (dialog.ShowModal() == wxID_OK)
     {
         wxColourData retData = dialog.GetColourData();


@@ -1616,7 +1789,7 @@ void RichTextFrame::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))
     }
 
     wxColourDialog dialog(this, &data);
     }
 
     wxColourDialog dialog(this, &data);

-    dialog.SetTitle(_T("Choose the text background colour"));
+    dialog.SetTitle(wxT("Choose the text background colour"));

     if (dialog.ShowModal() == wxID_OK)
     {
         wxColourData retData = dialog.GetColourData();
     if (dialog.ShowModal() == wxID_OK)
     {
         wxColourData retData = dialog.GetColourData();


@@ -1681,6 +1854,35 @@ void RichTextFrame::OnRightIndent(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void RichTextFrame::OnTabStops(wxCommandEvent& WXUNUSED(event))
+{
+    wxString tabsStr = wxGetTextFromUser
+                         (
+                            _("Please enter the tab stop positions in tenths of a millimetre, separated by spaces.\nLeave empty to reset tab stops."),
+                            _("Tab Stops"),
+                            wxEmptyString,
+                            this
+                         );
+
+    wxArrayInt tabs;
+
+    wxStringTokenizer tokens(tabsStr, wxT(" "));
+    while (tokens.HasMoreTokens())
+    {
+        wxString token = tokens.GetNextToken();
+        tabs.Add(wxAtoi(token));
+    }
+
+    wxTextAttr attr;
+    attr.SetTabs(tabs);
+
+    long start, end;
+    m_textCtrl->GetSelection(& start, & end);
+    m_textCtrl->SetStyle(start, end, attr);
+
+    m_currentPosition = -1;
+}
+

 void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
 {
     long insertionPoint = m_textCtrl->GetInsertionPoint();
 void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
 {
     long insertionPoint = m_textCtrl->GetInsertionPoint();


@@ -1692,7 +1894,7 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
         {
             wxString msg;
             wxString facename(wxT("unknown"));
         {
             wxString msg;
             wxString facename(wxT("unknown"));

-            if (attr.GetFont().Ok())
+            if (attr.GetFont().IsOk())

             {
                 facename = attr.GetFont().GetFaceName();
             }
             {
                 facename = attr.GetFont().GetFaceName();
             }


@@ -1705,10 +1907,20 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
                 alignment = wxT("left-aligned");
             else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_JUSTIFIED)
                 alignment = wxT("justified");
                 alignment = wxT("left-aligned");
             else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_JUSTIFIED)
                 alignment = wxT("justified");

-            msg.Printf(wxT("Facename: %s, wxColour(%d, %d, %d), %s"),
-                (const wxChar*) facename,
-                attr.GetTextColour().Red(), attr.GetTextColour().Green(), attr.GetTextColour().Blue(),
-                (const wxChar*) alignment);
+
+            msg.Printf("Facename: %s", facename);
+
+            if (attr.HasTextColour())
+            {
+                msg += wxString::Format(", colour: %s",
+                                        attr.GetTextColour().GetAsString());
+            }
+            else
+            {
+                msg += ", no colour";
+            }
+
+            msg << ", " << alignment;

 
             if (attr.HasFont())
             {
 
             if (attr.HasFont())
             {