add wxSocket::IsClosed(), use it to implement Eof() in wxSocketStream

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

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 7ddeaa84238beff4c90d3302df51ae0b94df1c47..f8ed400e59a9ae14b365f73ce4b4301ad9de7017 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        text.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        text.cpp

-// Purpose:     TextCtrl wxWindows sample
+// Purpose:     TextCtrl wxWidgets sample

 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$


@@ -8,10 +8,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "text.cpp"
-#endif
-

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


@@ -46,6 +42,8 @@
 
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
 
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"

+#include "wx/numdlg.h"
+#include "wx/tokenzr.h"

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


@@ -66,7 +64,7 @@ public:
                const wxPoint &pos, const wxSize &size, int style = 0)
         : wxTextCtrl(parent, id, value, pos, size, style)
     {
                const wxPoint &pos, const wxSize &size, int style = 0)
         : wxTextCtrl(parent, id, value, pos, size, style)
     {

-        m_hasCapture = FALSE;
+        m_hasCapture = false;

     }
 
     void OnKeyDown(wxKeyEvent& event);
     }
 
     void OnKeyDown(wxKeyEvent& event);


@@ -74,9 +72,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);


@@ -87,10 +90,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:
     static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); }
 
 private:
     static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); }

+

     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;
 


@@ -101,7 +107,12 @@ class MyPanel: public wxPanel
 {
 public:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
 {
 public:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);

-    virtual ~MyPanel() { delete wxLog::SetActiveTarget(m_logOld); }
+    virtual ~MyPanel()
+    {
+#if wxUSE_LOG
+        delete wxLog::SetActiveTarget(m_logOld);
+#endif // wxUSE_LOG
+    }

 
 #if wxUSE_CLIPBOARD
     void DoPasteFromClipboard();
 
 #if wxUSE_CLIPBOARD
     void DoPasteFromClipboard();


@@ -114,7 +125,13 @@ public:
     void DoMoveToEndOfText();
     void DoMoveToEndOfEntry();
 
     void DoMoveToEndOfText();
     void DoMoveToEndOfEntry();
 

-    void OnSize( wxSizeEvent &event );
+    // return true if currently text control has any selection
+    bool HasSelection() const
+    {
+        long from, to;
+        GetFocusedText()->GetSelection(&from, &to);
+        return from != to;
+    }

 
     MyTextCtrl    *m_text;
     MyTextCtrl    *m_password;
 
     MyTextCtrl    *m_text;
     MyTextCtrl    *m_password;


@@ -128,16 +145,16 @@ public:
 
     MyTextCtrl    *m_textrich;
 
 
     MyTextCtrl    *m_textrich;
 

+#if wxUSE_LOG

     wxTextCtrl    *m_log;
     wxTextCtrl    *m_log;

-

     wxLog         *m_logOld;
     wxLog         *m_logOld;

+#endif // wxUSE_LOG

 
 private:
 
 private:

-    // get the currently focused text control or return the default one is no
-    // text ctrl has focus
-    wxTextCtrl *GetFocusedText(wxTextCtrl *textDef);
-
-    DECLARE_EVENT_TABLE()
+    // get the currently focused text control or return the default one
+    // (m_multitext) is no text ctrl has focus -- in any case, returns
+    // something non NULL
+    wxTextCtrl *GetFocusedText() const;

 };
 
 class MyFrame: public wxFrame
 };
 
 class MyFrame: public wxFrame


@@ -153,53 +170,100 @@ public:
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD

-    void OnPasteFromClipboard( wxCommandEvent &event )
-        { m_panel->DoPasteFromClipboard(); }
-    void OnCopyToClipboard( wxCommandEvent &event )
-        { m_panel->DoCopyToClipboard(); }
+    void OnPasteFromClipboard( wxCommandEvent& WXUNUSED(event) )
+    {
+        wxLogMessage(_T("Pasting text from clipboard."));
+        m_panel->DoPasteFromClipboard();
+    }
+    void OnCopyToClipboard( wxCommandEvent& WXUNUSED(event) )
+    {
+        wxLogMessage(_T("Copying text to clipboard."));
+        m_panel->DoCopyToClipboard();
+    }
+
+    void OnUpdatePasteFromClipboard(wxUpdateUIEvent& event)
+    {
+        wxClipboardLocker lockClip;
+
+        event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) );
+    }
+
+    void OnUpdateCopyToClipboard(wxUpdateUIEvent& event)
+    {
+        event.Enable( m_panel->HasSelection() );
+    }

 #endif // wxUSE_CLIPBOARD
 
 #endif // wxUSE_CLIPBOARD
 

-    void OnAddTextFreeze( wxCommandEvent& event )
+    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); }
         { DoAddText(true); }

-    void OnAddText( wxCommandEvent& event )
+    void OnAddText( wxCommandEvent& WXUNUSED(event) )

         { DoAddText(false); }
         { DoAddText(false); }

-    void OnRemoveText( wxCommandEvent& event )
+    void OnRemoveText( wxCommandEvent& WXUNUSED(event) )

         { m_panel->DoRemoveText(); }
         { m_panel->DoRemoveText(); }

-    void OnReplaceText( wxCommandEvent& event )
+    void OnReplaceText( wxCommandEvent& WXUNUSED(event) )

         { m_panel->DoReplaceText(); }
         { m_panel->DoReplaceText(); }

-    void OnSelectText( wxCommandEvent& event )
+    void OnSelectText( wxCommandEvent& WXUNUSED(event) )

         { m_panel->DoSelectText(); }
 
         { m_panel->DoSelectText(); }
 

-    void OnMoveToEndOfText( wxCommandEvent &event )
+    void OnMoveToEndOfText( wxCommandEvent& WXUNUSED(event) )

         { m_panel->DoMoveToEndOfText(); }
         { m_panel->DoMoveToEndOfText(); }

-    void OnMoveToEndOfEntry( wxCommandEvent &event )
+    void OnMoveToEndOfEntry( wxCommandEvent& WXUNUSED(event) )

         { m_panel->DoMoveToEndOfEntry(); }
 
         { m_panel->DoMoveToEndOfEntry(); }
 

-    void OnScrollLineDown(wxCommandEvent& event)
+    void OnScrollLineDown(wxCommandEvent& WXUNUSED(event))

     {
         if ( !m_panel->m_textrich->LineDown() )
             wxLogMessage(_T("Already at the bottom"));
     }
 
     {
         if ( !m_panel->m_textrich->LineDown() )
             wxLogMessage(_T("Already at the bottom"));
     }
 

-    void OnScrollLineUp(wxCommandEvent& event)
+    void OnScrollLineUp(wxCommandEvent& WXUNUSED(event))

     {
         if ( !m_panel->m_textrich->LineUp() )
             wxLogMessage(_T("Already at the top"));
     }
 
     {
         if ( !m_panel->m_textrich->LineUp() )
             wxLogMessage(_T("Already at the top"));
     }
 

-    void OnScrollPageDown(wxCommandEvent& event)
+    void OnScrollPageDown(wxCommandEvent& WXUNUSED(event))

     {
         if ( !m_panel->m_textrich->PageDown() )
             wxLogMessage(_T("Already at the bottom"));
     }
 
     {
         if ( !m_panel->m_textrich->PageDown() )
             wxLogMessage(_T("Already at the bottom"));
     }
 

-    void OnScrollPageUp(wxCommandEvent& event)
+    void OnScrollPageUp(wxCommandEvent& WXUNUSED(event))

     {
         if ( !m_panel->m_textrich->PageUp() )
             wxLogMessage(_T("Already at the top"));
     }
 
     {
         if ( !m_panel->m_textrich->PageUp() )
             wxLogMessage(_T("Already at the top"));
     }
 

+    void OnGetLine(wxCommandEvent& WXUNUSED(event))
+    {
+        long nLine = wxGetNumberFromUser(wxT("Which line would you like to get?"),
+                                         wxT("Enter which line you would like to get"),
+                                         wxT("Get a line from the tabbed multiline text control") );
+
+        wxMessageBox(m_panel->m_tab->GetLineText(nLine));
+    }
+
+    void OnGetLineLength(wxCommandEvent& WXUNUSED(event))
+    {
+        long nLine = wxGetNumberFromUser(wxT("Which line would you like to get?"),
+                                         wxT("Enter which line you would like to get"),
+                                         wxT("Get length of a line from the tabbed multiline text control") );
+
+        wxMessageBox(wxString::Format(wxT("Length of line %i is:%i"),
+                                      (int) nLine,
+                                      m_panel->m_tab->GetLineLength(nLine))
+                    );
+    }
+
+#if wxUSE_LOG

     void OnLogClear(wxCommandEvent& event);
     void OnLogClear(wxCommandEvent& event);

+#endif // wxUSE_LOG

     void OnFileSave(wxCommandEvent& event);
     void OnFileLoad(wxCommandEvent& event);
     void OnRichTextTest(wxCommandEvent& event);
     void OnFileSave(wxCommandEvent& event);
     void OnFileLoad(wxCommandEvent& event);
     void OnRichTextTest(wxCommandEvent& event);


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

-    void OnSetText(wxCommandEvent& event)
+    void OnLogClip(wxCommandEvent& event)
+    {
+        MyTextCtrl::ms_logClip = event.IsChecked();
+    }
+
+    void OnSetText(wxCommandEvent& WXUNUSED(event))
+    {
+        m_panel->m_text->SetValue(_T("Hello, world! (what else did you expect?)"));
+    }
+
+    void OnChangeText(wxCommandEvent& WXUNUSED(event))

     {
     {

-        m_panel->m_text->SetValue(_T("Hello, world (what else did you expect)?"));
+        m_panel->m_text->ChangeValue(_T("Changed, not set: no event"));

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


@@ -243,20 +317,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;


@@ -276,6 +351,7 @@ public:
 // Event handlers
 
     void OnClose(wxCommandEvent& event);
 // Event handlers
 
     void OnClose(wxCommandEvent& event);

+    void OnIdle(wxIdleEvent& event);

     void OnLeftAlign(wxCommandEvent& event);
     void OnRightAlign(wxCommandEvent& event);
     void OnJustify(wxCommandEvent& event);
     void OnLeftAlign(wxCommandEvent& event);
     void OnRightAlign(wxCommandEvent& event);
     void OnJustify(wxCommandEvent& event);


@@ -285,9 +361,11 @@ 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;

+    long m_currentPosition;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -304,9 +382,9 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
 
 enum
 {

-    TEXT_QUIT = 100,
-    TEXT_ABOUT,
-    TEXT_LOAD,
+    TEXT_QUIT = wxID_EXIT,
+    TEXT_ABOUT = wxID_ABOUT,
+    TEXT_LOAD = 101,

     TEXT_SAVE,
     TEXT_CLEAR,
     TEXT_RICH_TEXT_TEST,
     TEXT_SAVE,
     TEXT_CLEAR,
     TEXT_RICH_TEXT_TEST,


@@ -314,6 +392,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,


@@ -322,6 +401,7 @@ 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_ENDENTRY,
     TEXT_SET_EDITABLE,
     TEXT_MOVE_ENDTEXT,
     TEXT_MOVE_ENDENTRY,
     TEXT_SET_EDITABLE,


@@ -330,10 +410,15 @@ enum
     TEXT_LINE_UP,
     TEXT_PAGE_DOWN,
     TEXT_PAGE_UP,
     TEXT_LINE_UP,
     TEXT_PAGE_DOWN,
     TEXT_PAGE_UP,

+
+    TEXT_GET_LINE,
+    TEXT_GET_LINELENGTH,
+

     TEXT_REMOVE,
     TEXT_REPLACE,
     TEXT_SELECT,
     TEXT_SET,
     TEXT_REMOVE,
     TEXT_REPLACE,
     TEXT_SELECT,
     TEXT_SET,

+    TEXT_CHANGE,

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


@@ -341,15 +426,19 @@ 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 wxWindows sample"), 50, 50, 700, 420);
+            _T("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;


@@ -372,69 +461,82 @@ bool MyApp::OnInit()
     tooltip_menu->Append(TEXT_TOOLTIPS_SETDELAY, _T("Set &delay\tCtrl-D"));
     tooltip_menu->AppendSeparator();
     tooltip_menu->Append(TEXT_TOOLTIPS_ENABLE, _T("&Toggle tooltips\tCtrl-T"),
     tooltip_menu->Append(TEXT_TOOLTIPS_SETDELAY, _T("Set &delay\tCtrl-D"));
     tooltip_menu->AppendSeparator();
     tooltip_menu->Append(TEXT_TOOLTIPS_ENABLE, _T("&Toggle tooltips\tCtrl-T"),

-            _T("enable/disable tooltips"), TRUE);
-    tooltip_menu->Check(TEXT_TOOLTIPS_ENABLE, TRUE);
+            _T("enable/disable tooltips"), true);
+    tooltip_menu->Check(TEXT_TOOLTIPS_ENABLE, true);

     menu_bar->Append(tooltip_menu, _T("&Tooltips"));
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_CLIPBOARD
     menu_bar->Append(tooltip_menu, _T("&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;
     wxMenu *menuClipboard = new wxMenu;

-    menuClipboard->Append(TEXT_CLIPBOARD_COPY, _T("&Copy\tCtrl-C"),
-                          _T("Copy the first line to the clipboard"));
-    menuClipboard->Append(TEXT_CLIPBOARD_PASTE, _T("&Paste\tCtrl-V"),
+    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"));
                           _T("Paste from clipboard to the text control"));

+    menuClipboard->AppendSeparator();
+    menuClipboard->AppendCheckItem(TEXT_CLIPBOARD_VETO, _T("Vet&o\tCtrl-Shift-O"),
+                                   _T("Veto all clipboard operations"));

     menu_bar->Append(menuClipboard, _T("&Clipboard"));
 #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"));
     menu_bar->Append(menuClipboard, _T("&Clipboard"));
 #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_ADD_LINE, _T("Append a new &line\tAlt-Shift-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_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_CHANGE, _T("&Change the first text zone value\tShift-Ctrl-E"));

     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->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->Append(TEXT_SET_EDITABLE, _T("Toggle &editable state"), _T(""), TRUE);
-    menuText->Append(TEXT_SET_ENABLED, _T("Toggle e&nabled state"), _T(""), TRUE);
-    menuText->Check(TEXT_SET_EDITABLE, TRUE);
-    menuText->Check(TEXT_SET_ENABLED, TRUE);
+    menuText->AppendCheckItem(TEXT_SET_EDITABLE, _T("Toggle &editable state"));
+    menuText->AppendCheckItem(TEXT_SET_ENABLED, _T("Toggle e&nabled state"));
+    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->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_DOWN, _T("Scroll text one page up"));
+    menuText->Append(TEXT_PAGE_UP, _T("Scroll text one page up"));
+    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"));
 
     menu_bar->Append(menuText, _T("Te&xt"));
 

+#if wxUSE_LOG

     wxMenu *menuLog = new wxMenu;
     wxMenu *menuLog = new wxMenu;

-    menuLog->Append(TEXT_LOG_KEY, _T("Log &key events"), _T(""), TRUE);
-    menuLog->Append(TEXT_LOG_CHAR, _T("Log &char events"), _T(""), TRUE);
-    menuLog->Append(TEXT_LOG_MOUSE, _T("Log &mouse events"), _T(""), TRUE);
-    menuLog->Append(TEXT_LOG_TEXT, _T("Log &text events"), _T(""), TRUE);
-    menuLog->Append(TEXT_LOG_FOCUS, _T("Log &focus events"), _T(""), TRUE);
+    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_CLIP, _T("Log clip&board events"));

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

-    menuLog->Append(TEXT_CLEAR, _T("&Clear the log\tCtrl-C"),
+    menuLog->Append(TEXT_CLEAR, _T("&Clear the log\tCtrl-L"),

                     _T("Clear the log window contents"));
 
     // select only the interesting events by default
                     _T("Clear the log window contents"));
 
     // select only the interesting events by default

-    menuLog->Check(TEXT_LOG_KEY, TRUE);
-    menuLog->Check(TEXT_LOG_CHAR, TRUE);
-    menuLog->Check(TEXT_LOG_TEXT, TRUE);
+    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_logKey =
-    MyTextCtrl::ms_logChar =
-    MyTextCtrl::ms_logText = TRUE;

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

+#endif // wxUSE_LOG

 
     frame->SetMenuBar(menu_bar);
 
 
     frame->SetMenuBar(menu_bar);
 

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

 
     SetTopWindow(frame);
 
     // report success
 
     SetTopWindow(frame);
 
     // report success

-    return TRUE;
+    return true;

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


@@ -446,9 +548,13 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
     EVT_KEY_UP(MyTextCtrl::OnKeyUp)
     EVT_CHAR(MyTextCtrl::OnChar)
 
     EVT_KEY_UP(MyTextCtrl::OnKeyUp)
     EVT_CHAR(MyTextCtrl::OnChar)
 

-    EVT_TEXT(-1, MyTextCtrl::OnText)
-    EVT_TEXT_URL(-1, MyTextCtrl::OnTextURL)
-    EVT_TEXT_MAXLEN(-1, MyTextCtrl::OnTextMaxLen)
+    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_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)
 


@@ -456,11 +562,12 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
     EVT_KILL_FOCUS(MyTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 
     EVT_KILL_FOCUS(MyTextCtrl::OnKillFocus)
 END_EVENT_TABLE()
 

-bool MyTextCtrl::ms_logKey = FALSE;
-bool MyTextCtrl::ms_logChar = FALSE;
-bool MyTextCtrl::ms_logMouse = FALSE;
-bool MyTextCtrl::ms_logText = FALSE;
-bool MyTextCtrl::ms_logFocus = FALSE;
+bool MyTextCtrl::ms_logKey = false;
+bool MyTextCtrl::ms_logChar = 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
 {


@@ -487,8 +594,6 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
             case WXK_MENU: key = _T("MENU"); break;
             case WXK_PAUSE: key = _T("PAUSE"); break;
             case WXK_CAPITAL: key = _T("CAPITAL"); 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_END: key = _T("END"); break;
             case WXK_HOME: key = _T("HOME"); break;
             case WXK_LEFT: key = _T("LEFT"); break;


@@ -557,7 +662,6 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
             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_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_PAGEUP: key = _T("NUMPAD_PAGEUP"); break;
             case WXK_NUMPAD_PAGEDOWN: key = _T("NUMPAD_PAGEDOWN"); break;
             case WXK_NUMPAD_END: key = _T("NUMPAD_END"); break;


@@ -583,6 +687,10 @@ void MyTextCtrl::LogKeyEvent(const wxChar *name, wxKeyEvent& event) const
         }
     }
 
         }
     }
 

+#if wxUSE_UNICODE
+    key += wxString::Format(_T(" (Unicode: %#04x)"), event.GetUnicodeKey());
+#endif // wxUSE_UNICODE
+

     wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"),
                   name,
                   key.c_str(),
     wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"),
                   name,
                   key.c_str(),


@@ -649,15 +757,24 @@ void MyTextCtrl::OnMouseEvent(wxMouseEvent& ev)
             msg = GetMouseEventDesc(ev);
         }
 
             msg = GetMouseEventDesc(ev);
         }
 

-        msg << _T(" at (") << ev.GetX() << _T(", ") << ev.GetY() << _T(") ")
-            << _T("Flags: ")
+        msg << _T(" at (") << ev.GetX() << _T(", ") << ev.GetY() << _T(") ");
+
+        long pos;
+        wxTextCtrlHitTestResult rc = HitTest(ev.GetPosition(), &pos);
+        if ( rc != wxTE_HT_UNKNOWN )
+        {
+            msg << _T("at position ") << pos << _T(' ');
+        }
+
+        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.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') );
+            << GetChar( ev.MetaDown(), _T('M') )
+            << _T(']');

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


@@ -686,23 +803,74 @@ void MyTextCtrl::OnText(wxCommandEvent& event)
         return;
 
     MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject();
         return;
 
     MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject();

+    const wxChar *changeVerb = win->IsModified() ? _T("changed")
+                                                 : _T("set by program");

     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(_T("Text %s in control \"%s\""), changeVerb, data);

     }
     else
     {
     }
     else
     {

-        // wxLogMessage( event.GetString() );
-        wxLogMessage(_T("Text changed in some control"));
+        wxLogMessage(_T("Text %s in some control"), changeVerb);

     }
 }
 
     }
 }
 

-void MyTextCtrl::OnTextMaxLen(wxCommandEvent& event)
+void MyTextCtrl::OnTextEnter(wxCommandEvent& event)
+{
+    if ( !ms_logText )
+        return;
+
+    MyTextCtrl *win = (MyTextCtrl *)event.GetEventObject();
+    const wxChar *data = (const wxChar *)(win->GetClientData());
+    if ( data )
+    {
+        wxLogMessage(_T("Enter pressed in control '%s'"), data);
+    }
+    else
+    {
+        wxLogMessage(_T("Enter pressed in some control"));
+    }
+}
+
+void MyTextCtrl::OnTextMaxLen(wxCommandEvent& WXUNUSED(event))

 {
     wxLogMessage(_T("You can't enter more characters into this control."));
 }
 
 {
     wxLogMessage(_T("You can't enter more characters into this control."));
 }
 

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

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


@@ -750,7 +918,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
                         line, column,
                         (long) GetNumberOfLines(),
                         (long) GetLineLength(line),
                         line, column,
                         (long) GetNumberOfLines(),
                         (long) GetLineLength(line),

-                        GetValue().length(),
+                        (unsigned int) GetValue().length(),

                         GetLastPosition());
 
                 long from, to;
                         GetLastPosition());
 
                 long from, to;


@@ -760,7 +928,12 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
 
                 wxLogMessage(_T("Selection: from %ld to %ld."), from, to);
                 wxLogMessage(_T("Selection = '%s' (len = %u)"),
 
                 wxLogMessage(_T("Selection: from %ld to %ld."), from, to);
                 wxLogMessage(_T("Selection = '%s' (len = %u)"),

-                             sel.c_str(), sel.length());
+                             sel.c_str(),
+                             (unsigned int) sel.length());
+
+                const wxString text = GetLineText(line);
+                wxLogMessage(_T("Current line: \"%s\"; length = %lu"),
+                             text.c_str(), text.length());

             }
             break;
 
             }
             break;
 


@@ -778,13 +951,13 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
             if (!m_hasCapture)
             {
                 wxLogDebug( wxT("Now capturing mouse and events.") );
             if (!m_hasCapture)
             {
                 wxLogDebug( wxT("Now capturing mouse and events.") );

-                m_hasCapture = TRUE;
+                m_hasCapture = true;

                 CaptureMouse();
             }
             else
             {
                 wxLogDebug( wxT("Stopped capturing mouse and events.") );
                 CaptureMouse();
             }
             else
             {
                 wxLogDebug( wxT("Stopped capturing mouse and events.") );

-                m_hasCapture = FALSE;
+                m_hasCapture = false;

                 ReleaseMouse();
             }
             break;
                 ReleaseMouse();
             }
             break;


@@ -797,7 +970,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
         case WXK_F6:
             wxLogMessage(_T("IsModified() before SetValue(): %d"),
                          IsModified());
         case WXK_F6:
             wxLogMessage(_T("IsModified() before SetValue(): %d"),
                          IsModified());

-            SetValue(_T("SetValue() has been called"));
+            ChangeValue(_T("ChangeValue() has been called"));

             wxLogMessage(_T("IsModified() after SetValue(): %d"),
                          IsModified());
             break;
             wxLogMessage(_T("IsModified() after SetValue(): %d"),
                          IsModified());
             break;


@@ -819,6 +992,11 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
         case WXK_F10:
             AppendText(_T("AppendText() has been called"));
             break;
         case WXK_F10:
             AppendText(_T("AppendText() has been called"));
             break;

+
+        case WXK_F11:
+            DiscardEdits();
+            wxLogMessage(_T("Control marked as non modified"));
+            break;

     }
 
     if ( ms_logKey )
     }
 
     if ( ms_logKey )


@@ -831,23 +1009,21 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
 // MyPanel
 //----------------------------------------------------------------------
 
 // MyPanel
 //----------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(MyPanel, wxPanel)
-    EVT_SIZE(MyPanel::OnSize)
-END_EVENT_TABLE()
-

 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )

-       : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
+       : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) )

 {
 {

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

                             wxPoint(5,260), wxSize(630,100),
                             wxTE_MULTILINE | wxTE_READONLY /* | wxTE_RICH */);
 
     m_logOld = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );
                             wxPoint(5,260), wxSize(630,100),
                             wxTE_MULTILINE | wxTE_READONLY /* | wxTE_RICH */);
 
     m_logOld = wxLog::SetActiveTarget( new wxLogTextCtrl( m_log ) );

+#endif // wxUSE_LOG

 
     // single line text controls
 
 
     // single line text controls
 

-    m_text = new MyTextCtrl( this, -1, _T("Single line."),
-                             wxPoint(10,10), wxSize(140,-1),
+    m_text = new MyTextCtrl( this, wxID_ANY, _T("Single line."),
+                             wxDefaultPosition, wxDefaultSize,

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


@@ -855,58 +1031,59 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_text->SetInsertionPoint(0);
     m_text->WriteText( _T("Prepended. ") );
 
     m_text->SetInsertionPoint(0);
     m_text->WriteText( _T("Prepended. ") );
 

-    m_password = new MyTextCtrl( this, -1, _T(""),
-      wxPoint(10,50), wxSize(140,-1), wxTE_PASSWORD );
+    m_password = new MyTextCtrl( this, wxID_ANY, _T(""),
+      wxPoint(10,50), wxSize(140,wxDefaultCoord), wxTE_PASSWORD );

 
 

-    m_readonly = new MyTextCtrl( this, -1, _T("Read only"),
-      wxPoint(10,90), wxSize(140,-1), wxTE_READONLY );
+    m_readonly = new MyTextCtrl( this, wxID_ANY, _T("Read only"),
+      wxPoint(10,90), wxSize(140,wxDefaultCoord), wxTE_READONLY );

 
 

-    m_limited = new MyTextCtrl(this, -1, _T("Max 8 ch"),
-                              wxPoint(10, 130), wxSize(140, -1));
+    m_limited = new MyTextCtrl(this, wxID_ANY, _T("Max 8 ch"),
+                              wxPoint(10, 130), wxSize(140, wxDefaultCoord));

     m_limited->SetMaxLength(8);
 
     // multi line text controls
 
     m_limited->SetMaxLength(8);
 
     // multi line text controls
 

-    m_horizontal = new MyTextCtrl( this, -1, _T("Multiline text control with a horizontal scrollbar."),
-      wxPoint(10,170), wxSize(140,70), wxTE_MULTILINE | wxHSCROLL );
+    m_horizontal = new MyTextCtrl( this, wxID_ANY, _T("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 )
     {
 
     // 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, _T(""),

                                              wxFONTENCODING_ISO8859_2));
                                              wxFONTENCODING_ISO8859_2));

-                m_horizontal->SetValue(_T("®lu»ouèký kùò zbìsile èe¹tina «»"));
+                m_horizontal->AppendText(_T("\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, _T(""),

                                              wxFONTENCODING_CP1251));
                                              wxFONTENCODING_CP1251));

-                m_horizontal->SetValue(_T("Ïðèâåò!"));
+                m_horizontal->AppendText(_T("\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, _T(""),

                                              wxFONTENCODING_CP1251));
 #if wxUSE_UNICODE
                                              wxFONTENCODING_CP1251));
 #if wxUSE_UNICODE

-                m_horizontal->SetValue(L"\x0412\x0430\x0434\x0438\x043c \x0426");
+                m_horizontal->AppendText(L"\x0412\x0430\x0434\x0438\x043c \x0426");

 #else
 #else

-                m_horizontal->SetValue("ËÁÖÅÔÓÑ ÕÄÁÞÎÙÍ");
+                m_horizontal->AppendText("\313\301\326\305\324\323\321 \325\304\301\336\316\331\315");

 #endif
         }
     }
     else
     {
 #endif
         }
     }
     else
     {

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

     }
 
     }
 

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

     m_multitext->SetFont(*wxITALIC_FONT);
     (*m_multitext) << _T(" Appended.");
     m_multitext->SetInsertionPoint(0);
     m_multitext->SetFont(*wxITALIC_FONT);
     (*m_multitext) << _T(" Appended.");
     m_multitext->SetInsertionPoint(0);


@@ -919,24 +1096,22 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #endif
 
     m_tab = new MyTextCtrl( this, 100, _T("Multiline, allow <TAB> processing."),
 #endif
 
     m_tab = new MyTextCtrl( this, 100, _T("Multiline, allow <TAB> processing."),

-      wxPoint(180,90), wxSize(240,70), wxTE_MULTILINE |  wxTE_PROCESS_TAB );
+      wxPoint(180,90), wxSize(200,70), wxTE_MULTILINE |  wxTE_PROCESS_TAB );

     m_tab->SetClientData((void *)_T("tab"));
 
     m_enter = new MyTextCtrl( this, 100, _T("Multiline, allow <ENTER> processing."),
     m_tab->SetClientData((void *)_T("tab"));
 
     m_enter = new MyTextCtrl( this, 100, _T("Multiline, allow <ENTER> processing."),

-      wxPoint(180,170), wxSize(240,70), wxTE_MULTILINE);
+      wxPoint(180,170), wxSize(200,70), wxTE_MULTILINE);

     m_enter->SetClientData((void *)_T("enter"));
 
     m_enter->SetClientData((void *)_T("enter"));
 

-#if 0
-    m_textrich = new MyTextCtrl(this, -1, _T("Allows more than 30Kb of text\n")
+    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("(even under broken Win9x)\n")
                                 _T("and a very very very very very ")
                                 _T("very very very long line to test ")

-                                _T("wxHSCROLL style"),
-                                wxPoint(450, 10), wxSize(230, 230),
-                                wxTE_RICH2 |
-                                wxTE_MULTILINE |
-                                // wxTE_AUTO_URL |
-                                wxHSCROLL);
+                                _T("wxHSCROLL style\n")
+                                _T("\nAnd here is a link in quotation marks to ")
+                                _T("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);
     m_textrich->SetStyle(10, 20, *wxBLUE);
     m_textrich->SetStyle(30, 40,
     m_textrich->SetStyle(0, 10, *wxRED);
     m_textrich->SetStyle(10, 20, *wxBLUE);
     m_textrich->SetStyle(30, 40,


@@ -951,28 +1126,42 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     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->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"));

-#else
-    m_textrich = new MyTextCtrl(this, -1, _T(""),
-                                wxPoint(450, 10), wxSize(230, 230),
-                                wxTE_RICH2 |
-                                wxTE_MULTILINE |
-                                wxHSCROLL);
+
+
+    // 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_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_enter, 1, wxALL | wxEXPAND, 10 );
+
+    wxBoxSizer *row1 = new wxBoxSizer(wxHORIZONTAL);
+    row1->Add( column1, 0, wxALL | wxEXPAND, 10 );
+    row1->Add( column2, 1, wxALL | wxEXPAND, 10 );
+    row1->Add( m_textrich, 1, wxALL | wxEXPAND, 10 );
+
+    wxBoxSizer *topSizer = new wxBoxSizer(wxVERTICAL);
+    topSizer->Add( row1, 2, wxALL | wxEXPAND, 10 );
+
+#if wxUSE_LOG
+    topSizer->Add( m_log, 1, wxALL | wxEXPAND, 10 );

 #endif
 #endif

-}

 
 

-void MyPanel::OnSize( wxSizeEvent &event )
-{
-    wxSize client_area( GetClientSize() );
-    m_log->SetSize( 0, 260, client_area.x, client_area.y - 260 );
-    event.Skip();
+    SetSizer(topSizer);

 }
 
 }
 

-wxTextCtrl *MyPanel::GetFocusedText(wxTextCtrl *textDef)
+wxTextCtrl *MyPanel::GetFocusedText() const

 {
     wxWindow *win = FindFocus();
 
     wxTextCtrl *text = win ? wxDynamicCast(win, wxTextCtrl) : NULL;
 {
     wxWindow *win = FindFocus();
 
     wxTextCtrl *text = win ? wxDynamicCast(win, wxTextCtrl) : NULL;

-    return text ? text : textDef;
+    return text ? text : m_multitext;

 }
 
 #if wxUSE_CLIPBOARD
 }
 
 #if wxUSE_CLIPBOARD


@@ -985,38 +1174,52 @@ void MyPanel::DoPasteFromClipboard()
 
     if (!wxTheClipboard->Open())
     {
 
     if (!wxTheClipboard->Open())
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

         return;
     }
     else
     {
         return;
     }
     else
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

     }
 
     wxTextDataObject data;
 
     if (wxTheClipboard->IsSupported( data.GetFormat() ))
     {
     }
 
     wxTextDataObject data;
 
     if (wxTheClipboard->IsSupported( data.GetFormat() ))
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

 
         if (wxTheClipboard->GetData( data ))
         {
 
         if (wxTheClipboard->GetData( data ))
         {

+#if wxUSE_LOG

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

-            *m_multitext << data.GetText() << _T("\n");
+#endif // wxUSE_LOG
+            GetFocusedText()->AppendText(data.GetText());

         }
         else
         {
         }
         else
         {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

         }
     }
     else
     {
         }
     }
     else
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

     }
 
     wxTheClipboard->Close();
 
     }
 
     wxTheClipboard->Close();
 

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

 }
 
 void MyPanel::DoCopyToClipboard()
 }
 
 void MyPanel::DoCopyToClipboard()


@@ -1026,40 +1229,52 @@ void MyPanel::DoCopyToClipboard()
     // call has no effect under MSW.
     wxTheClipboard->UsePrimarySelection();
 
     // call has no effect under MSW.
     wxTheClipboard->UsePrimarySelection();
 

-    wxString text( m_multitext->GetLineText(0) );
+    wxString text( GetFocusedText()->GetStringSelection() );

 
     if (text.IsEmpty())
     {
 
     if (text.IsEmpty())
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

 
         return;
     }
 
     if (!wxTheClipboard->Open())
     {
 
         return;
     }
 
     if (!wxTheClipboard->Open())
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

 
         return;
     }
     else
     {
 
         return;
     }
     else
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

     }
 
     wxTextDataObject *data = new wxTextDataObject( text );
 
     if (!wxTheClipboard->SetData( data ))
     {
     }
 
     wxTextDataObject *data = new wxTextDataObject( text );
 
     if (!wxTheClipboard->SetData( data ))
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

     }
     else
     {
     }
     else
     {

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

     }
 
     wxTheClipboard->Close();
 
     }
 
     wxTheClipboard->Close();
 

+#if wxUSE_LOG

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

+#endif // wxUSE_LOG

 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD


@@ -1078,17 +1293,17 @@ void MyPanel::DoMoveToEndOfEntry()
 
 void MyPanel::DoRemoveText()
 {
 
 void MyPanel::DoRemoveText()
 {

-    GetFocusedText(m_multitext)->Remove(0, 10);
+    GetFocusedText()->Remove(0, 10);

 }
 
 void MyPanel::DoReplaceText()
 {
 }
 
 void MyPanel::DoReplaceText()
 {

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

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

-    GetFocusedText(m_multitext)->SetSelection(3, 8);
+    GetFocusedText()->SetSelection(3, 8);

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


@@ -1107,7 +1322,10 @@ 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)
     EVT_MENU(TEXT_CLEAR,    MyFrame::OnLogClear)

+#endif // wxUSE_LOG

 
 #if wxUSE_TOOLTIPS
     EVT_MENU(TEXT_TOOLTIPS_SETDELAY,  MyFrame::OnSetTooltipDelay)
 
 #if wxUSE_TOOLTIPS
     EVT_MENU(TEXT_TOOLTIPS_SETDELAY,  MyFrame::OnSetTooltipDelay)


@@ -1117,6 +1335,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_CLIPBOARD
     EVT_MENU(TEXT_CLIPBOARD_PASTE,    MyFrame::OnPasteFromClipboard)
     EVT_MENU(TEXT_CLIPBOARD_COPY,     MyFrame::OnCopyToClipboard)
 #if wxUSE_CLIPBOARD
     EVT_MENU(TEXT_CLIPBOARD_PASTE,    MyFrame::OnPasteFromClipboard)
     EVT_MENU(TEXT_CLIPBOARD_COPY,     MyFrame::OnCopyToClipboard)

+
+    EVT_UPDATE_UI(TEXT_CLIPBOARD_PASTE, MyFrame::OnUpdatePasteFromClipboard)
+    EVT_UPDATE_UI(TEXT_CLIPBOARD_COPY,  MyFrame::OnUpdateCopyToClipboard)

 #endif // wxUSE_CLIPBOARD
 
     EVT_MENU(TEXT_REMOVE,             MyFrame::OnRemoveText)
 #endif // wxUSE_CLIPBOARD
 
     EVT_MENU(TEXT_REMOVE,             MyFrame::OnRemoveText)


@@ -1124,6 +1345,7 @@ 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_ENDENTRY,      MyFrame::OnMoveToEndOfEntry)
 
     EVT_MENU(TEXT_MOVE_ENDTEXT,       MyFrame::OnMoveToEndOfText)
     EVT_MENU(TEXT_MOVE_ENDENTRY,      MyFrame::OnMoveToEndOfEntry)
 


@@ -1135,22 +1357,28 @@ 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_SET,                MyFrame::OnSetText)
     EVT_MENU(TEXT_SET,                MyFrame::OnSetText)

+    EVT_MENU(TEXT_CHANGE,             MyFrame::OnChangeText)

 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)
 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h)

-       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h) )
+       : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h) )

 {
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );
 }
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 {
 
     m_panel = new MyPanel( this, 10, 10, 300, 100 );
 }
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 {

-    Close(TRUE);
+    Close(true);

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


@@ -1172,7 +1400,8 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
+
+void MyFrame::OnSetTooltipDelay(wxCommandEvent& WXUNUSED(event))

 {
     static long s_delay = 5000;
 
 {
     static long s_delay = 5000;
 


@@ -1193,9 +1422,9 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
     wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
 }
 
     wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
 }
 

-void MyFrame::OnToggleTooltips(wxCommandEvent& event)
+void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))

 {
 {

-    static bool s_enabled = TRUE;
+    static bool s_enabled = true;

 
     s_enabled = !s_enabled;
 
 
     s_enabled = !s_enabled;
 


@@ -1205,14 +1434,16 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event)
 }
 #endif // tooltips
 
 }
 #endif // tooltips
 

+#if wxUSE_LOG

 void MyFrame::OnLogClear(wxCommandEvent& WXUNUSED(event))
 {
     m_panel->m_log->Clear();
 }
 void MyFrame::OnLogClear(wxCommandEvent& WXUNUSED(event))
 {
     m_panel->m_log->Clear();
 }

+#endif // wxUSE_LOG

 
 void MyFrame::OnSetEditable(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnSetEditable(wxCommandEvent& WXUNUSED(event))
 {

-    static bool s_editable = TRUE;
+    static bool s_editable = true;

 
     s_editable = !s_editable;
     m_panel->m_text->SetEditable(s_editable);
 
     s_editable = !s_editable;
     m_panel->m_text->SetEditable(s_editable);


@@ -1234,7 +1465,7 @@ void MyFrame::OnSetEnabled(wxCommandEvent& WXUNUSED(event))
     m_panel->m_textrich->Enable(enabled);
 }
 
     m_panel->m_textrich->Enable(enabled);
 }
 

-void MyFrame::OnFileSave(wxCommandEvent& event)
+void MyFrame::OnFileSave(wxCommandEvent& WXUNUSED(event))

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


@@ -1251,7 +1482,7 @@ void MyFrame::OnFileSave(wxCommandEvent& event)
         wxLogStatus(this, _T("Couldn't save the file"));
 }
 
         wxLogStatus(this, _T("Couldn't save the file"));
 }
 

-void MyFrame::OnFileLoad(wxCommandEvent& 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(_T("dummy.txt")) )
         wxLogStatus(this, _T("Successfully loaded file"));


@@ -1259,10 +1490,10 @@ void MyFrame::OnFileLoad(wxCommandEvent& event)
         wxLogStatus(this, _T("Couldn't load the file"));
 }
 
         wxLogStatus(this, _T("Couldn't load the file"));
 }
 

-void MyFrame::OnRichTextTest(wxCommandEvent& event)
+void MyFrame::OnRichTextTest(wxCommandEvent& WXUNUSED(event))

 {
     RichTextFrame* frame = new RichTextFrame(this, _T("Rich Text Editor"));
 {
     RichTextFrame* frame = new RichTextFrame(this, _T("Rich Text Editor"));

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

 }
 
 void MyFrame::OnIdle( wxIdleEvent& event )
 }
 
 void MyFrame::OnIdle( wxIdleEvent& event )


@@ -1277,17 +1508,19 @@ void MyFrame::OnIdle( wxIdleEvent& event )
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__

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

 #else
                 _T("Focus: wxWindow = %p"),
 #endif
                 s_windowFocus
 #ifdef __WXMSW__
 #else
                 _T("Focus: wxWindow = %p"),
 #endif
                 s_windowFocus
 #ifdef __WXMSW__

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

 #endif
                   );
 
 #endif
                   );
 

+#if wxUSE_STATUSBAR

         SetStatusText(msg);
         SetStatusText(msg);

+#endif // wxUSE_STATUSBAR

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


@@ -1307,10 +1540,12 @@ 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)

+    EVT_IDLE(RichTextFrame::OnIdle)

     EVT_MENU(RICHTEXT_CLOSE, RichTextFrame::OnClose)
     EVT_MENU(RICHTEXT_LEFT_ALIGN, RichTextFrame::OnLeftAlign)
     EVT_MENU(RICHTEXT_RIGHT_ALIGN, RichTextFrame::OnRightAlign)
     EVT_MENU(RICHTEXT_CLOSE, RichTextFrame::OnClose)
     EVT_MENU(RICHTEXT_LEFT_ALIGN, RichTextFrame::OnLeftAlign)
     EVT_MENU(RICHTEXT_RIGHT_ALIGN, RichTextFrame::OnRightAlign)


@@ -1321,12 +1556,14 @@ 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):

-    wxFrame(parent, -1, title, wxDefaultPosition, wxSize(300, 400))
+    wxFrame(parent, wxID_ANY, title, wxDefaultPosition, wxSize(300, 400))

 {
 {

-    m_textCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+    m_currentPosition = -1;
+    m_textCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,

             wxDefaultSize, wxTE_MULTILINE|wxTE_RICH2);
 
     wxString value;
             wxDefaultSize, wxTE_MULTILINE|wxTE_RICH2);
 
     wxString value;


@@ -1358,20 +1595,24 @@ 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);

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

 }
 
 // Event handlers
 
 }
 
 // Event handlers
 

-void RichTextFrame::OnClose(wxCommandEvent& event)
+void RichTextFrame::OnClose(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    Close(true);

 }
 
 }
 

-void RichTextFrame::OnLeftAlign(wxCommandEvent& event)
+void RichTextFrame::OnLeftAlign(wxCommandEvent& WXUNUSED(event))

 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_LEFT);
 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_LEFT);


@@ -1379,9 +1620,11 @@ void RichTextFrame::OnLeftAlign(wxCommandEvent& event)
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);

+
+    m_currentPosition = -1;

 }
 
 }
 

-void RichTextFrame::OnRightAlign(wxCommandEvent& event)
+void RichTextFrame::OnRightAlign(wxCommandEvent& WXUNUSED(event))

 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_RIGHT);
 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_RIGHT);


@@ -1389,9 +1632,11 @@ void RichTextFrame::OnRightAlign(wxCommandEvent& event)
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);

+
+    m_currentPosition = -1;

 }
 
 }
 

-void RichTextFrame::OnJustify(wxCommandEvent& event)
+void RichTextFrame::OnJustify(wxCommandEvent& WXUNUSED(event))

 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_JUSTIFIED);
 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_JUSTIFIED);


@@ -1399,9 +1644,11 @@ void RichTextFrame::OnJustify(wxCommandEvent& event)
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);

+
+    m_currentPosition = -1;

 }
 
 }
 

-void RichTextFrame::OnCentre(wxCommandEvent& event)
+void RichTextFrame::OnCentre(wxCommandEvent& WXUNUSED(event))

 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_CENTRE);
 {
     wxTextAttr attr;
     attr.SetAlignment(wxTEXT_ALIGNMENT_CENTRE);


@@ -1409,9 +1656,11 @@ void RichTextFrame::OnCentre(wxCommandEvent& event)
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);
     long start, end;
     m_textCtrl->GetSelection(& start, & end);
     m_textCtrl->SetStyle(start, end, attr);

+
+    m_currentPosition = -1;

 }
 
 }
 

-void RichTextFrame::OnChangeFont(wxCommandEvent& event)
+void RichTextFrame::OnChangeFont(wxCommandEvent& WXUNUSED(event))

 {
     wxFontData data;
 
 {
     wxFontData data;
 


@@ -1424,21 +1673,23 @@ void RichTextFrame::OnChangeFont(wxCommandEvent& event)
 
         wxTextAttr attr;
         attr.SetFont(font);
 
         wxTextAttr attr;
         attr.SetFont(font);

-        
+

         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);
         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);

+
+        m_currentPosition = -1;

     }
 }
 
     }
 }
 

-void RichTextFrame::OnChangeTextColour(wxCommandEvent& event)
+void RichTextFrame::OnChangeTextColour(wxCommandEvent& WXUNUSED(event))

 {
     wxColourData data;
     data.SetColour(* wxBLACK);
 {
     wxColourData data;
     data.SetColour(* wxBLACK);

-    data.SetChooseFull(TRUE);
+    data.SetChooseFull(true);

     for (int i = 0; i < 16; i++)
     {
     for (int i = 0; i < 16; i++)
     {

-        wxColour colour(i*16, i*16, i*16);
+        wxColour colour((unsigned char)(i*16), (unsigned char)(i*16), (unsigned char)(i*16));

         data.SetCustomColour(i, colour);
     }
 
         data.SetCustomColour(i, colour);
     }
 


@@ -1451,21 +1702,23 @@ void RichTextFrame::OnChangeTextColour(wxCommandEvent& event)
 
         wxTextAttr attr;
         attr.SetTextColour(col);
 
         wxTextAttr attr;
         attr.SetTextColour(col);

-        
+

         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);
         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);

+
+        m_currentPosition = -1;

     }
 }
 
     }
 }
 

-void RichTextFrame::OnChangeBackgroundColour(wxCommandEvent& event)
+void RichTextFrame::OnChangeBackgroundColour(wxCommandEvent& WXUNUSED(event))

 {
     wxColourData data;
     data.SetColour(* wxWHITE);
 {
     wxColourData data;
     data.SetColour(* wxWHITE);

-    data.SetChooseFull(TRUE);
+    data.SetChooseFull(true);

     for (int i = 0; i < 16; i++)
     {
     for (int i = 0; i < 16; i++)
     {

-        wxColour colour(i*16, i*16, i*16);
+        wxColour colour((unsigned char)(i*16), (unsigned char)(i*16), (unsigned char)(i*16));

         data.SetCustomColour(i, colour);
     }
 
         data.SetCustomColour(i, colour);
     }
 


@@ -1478,43 +1731,137 @@ void RichTextFrame::OnChangeBackgroundColour(wxCommandEvent& event)
 
         wxTextAttr attr;
         attr.SetBackgroundColour(col);
 
         wxTextAttr attr;
         attr.SetBackgroundColour(col);

-        
+

         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);
         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);

+
+        m_currentPosition = -1;

     }
 }
 
     }
 }
 

-void RichTextFrame::OnLeftIndent(wxCommandEvent& event)
+void RichTextFrame::OnLeftIndent(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxString indentStr = wxGetTextFromUser(_("Please enter the left indent in tenths of a millimetre."),
-        _("Left Indent"));
+    wxString indentStr = wxGetTextFromUser
+                         (
+                            _("Please enter the left indent in tenths of a millimetre."),
+                            _("Left Indent"),
+                            wxEmptyString,
+                            this
+                         );

     if (!indentStr.IsEmpty())
     {
         int indent = wxAtoi(indentStr);
 
         wxTextAttr attr;
         attr.SetLeftIndent(indent);
     if (!indentStr.IsEmpty())
     {
         int indent = wxAtoi(indentStr);
 
         wxTextAttr attr;
         attr.SetLeftIndent(indent);

-        
+

         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);
         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);

+
+        m_currentPosition = -1;

     }
 }
 
     }
 }
 

-void RichTextFrame::OnRightIndent(wxCommandEvent& event)
+void RichTextFrame::OnRightIndent(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxString indentStr = wxGetTextFromUser(_("Please enter the right indent in tenths of a millimetre."),
-        _("Right Indent"));
+    wxString indentStr = wxGetTextFromUser
+                         (
+                            _("Please enter the right indent in tenths of a millimetre."),
+                            _("Right Indent"),
+                            wxEmptyString,
+                            this
+                         );

     if (!indentStr.IsEmpty())
     {
         int indent = wxAtoi(indentStr);
 
         wxTextAttr attr;
         attr.SetRightIndent(indent);
     if (!indentStr.IsEmpty())
     {
         int indent = wxAtoi(indentStr);
 
         wxTextAttr attr;
         attr.SetRightIndent(indent);

-        
+

         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);
         long start, end;
         m_textCtrl->GetSelection(& start, & end);
         m_textCtrl->SetStyle(start, end, attr);

+
+        m_currentPosition = -1;
+    }
+}
+
+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, _T(" "));
+    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();
+    if (insertionPoint != m_currentPosition)
+    {
+#if wxUSE_STATUSBAR
+        wxTextAttr attr;
+        if (m_textCtrl->GetStyle(insertionPoint, attr))
+        {
+            wxString msg;
+            wxString facename(wxT("unknown"));
+            if (attr.GetFont().Ok())
+            {
+                facename = attr.GetFont().GetFaceName();
+            }
+            wxString alignment(wxT("unknown alignment"));
+            if (attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
+                alignment = wxT("centred");
+            else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_RIGHT)
+                alignment = wxT("right-aligned");
+            else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_LEFT)
+                alignment = wxT("left-aligned");
+            else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_JUSTIFIED)
+                alignment = wxT("justified");
+            msg.Printf( "Facename: %s, wxColour(%d, %d, %d), %s", facename,
+                attr.GetTextColour().Red(), attr.GetTextColour().Green(), attr.GetTextColour().Blue(),
+                alignment );
+
+            if (attr.HasFont())
+            {
+                if (attr.GetFont().GetWeight() == wxBOLD)
+                    msg += wxT(" BOLD");
+                else if (attr.GetFont().GetWeight() == wxNORMAL)
+                    msg += wxT(" NORMAL");
+
+                if (attr.GetFont().GetStyle() == wxITALIC)
+                    msg += wxT(" ITALIC");
+
+                if (attr.GetFont().GetUnderlined())
+                    msg += wxT(" UNDERLINED");
+            }
+
+            SetStatusText(msg);
+        }
+#endif // wxUSE_STATUSBAR
+        m_currentPosition = insertionPoint;

     }
 }
     }
 }