Support using GetTextExtent() with empty string to get descent in wxOSX.

[wxWidgets.git] / samples / widgets / textctrl.cpp

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index a30268abdd2f0ab1ed248d30ad983218db99d02d..c69f23d0b5127ace47b82fddca3de58e5093019e 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        textctrl.cpp
 // Purpose:     part of the widgets sample showing wxTextCtrl
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Name:        textctrl.cpp
 // Purpose:     part of the widgets sample showing wxTextCtrl
 // Author:      Vadim Zeitlin
 // Created:     27.03.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin

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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -36,9 +36,11 @@
     #include "wx/statbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
     #include "wx/statbox.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"

+    #include "wx/msgdlg.h"

 #endif
 
 #include "wx/sizer.h"
 #endif
 
 #include "wx/sizer.h"

+#include "wx/ioswrap.h"

 
 #include "widgets.h"
 
 
 #include "widgets.h"
 


@@ -51,7 +53,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    TextPage_Reset = 100,
+    TextPage_Reset = wxID_HIGHEST,

 
     TextPage_Set,
     TextPage_Add,
 
     TextPage_Set,
     TextPage_Add,


@@ -59,6 +61,8 @@ enum
     TextPage_Clear,
     TextPage_Load,
 
     TextPage_Clear,
     TextPage_Load,
 

+    TextPage_StreamRedirector,
+

     TextPage_Password,
     TextPage_WrapLines,
     TextPage_Textctrl
     TextPage_Password,
     TextPage_WrapLines,
     TextPage_Textctrl


@@ -68,7 +72,18 @@ enum
 enum TextLines
 {
     TextLines_Single,
 enum TextLines
 {
     TextLines_Single,

-    TextLines_Multi
+    TextLines_Multi,
+    TextLines_Max
+};
+
+// wrap style radio box
+enum WrapStyle
+{
+    WrapStyle_None,
+    WrapStyle_Word,
+    WrapStyle_Char,
+    WrapStyle_Best,
+    WrapStyle_Max

 };
 
 #ifdef __WXMSW__
 };
 
 #ifdef __WXMSW__


@@ -78,7 +93,8 @@ enum TextKind
 {
     TextKind_Plain,
     TextKind_Rich,
 {
     TextKind_Plain,
     TextKind_Rich,

-    TextKind_Rich2
+    TextKind_Rich2,
+    TextKind_Max

 };
 
 #endif // __WXMSW__
 };
 
 #endif // __WXMSW__


@@ -87,9 +103,14 @@ enum TextKind
 static const struct ControlValues
 {
     TextLines textLines;
 static const struct ControlValues
 {
     TextLines textLines;

+

     bool password;
     bool password;

-    bool wraplines;

     bool readonly;
     bool readonly;

+    bool processEnter;
+    bool filename;
+
+    WrapStyle wrapStyle;
+

 #ifdef __WXMSW__
     TextKind textKind;
 #endif // __WXMSW__
 #ifdef __WXMSW__
     TextKind textKind;
 #endif // __WXMSW__


@@ -97,8 +118,10 @@ static const struct ControlValues
 {
     TextLines_Multi,    // multiline
     false,              // not password
 {
     TextLines_Multi,    // multiline
     false,              // not password

-    true,               // do wrap lines

     false,              // not readonly
     false,              // not readonly

+    true,               // do process enter
+    false,              // not filename
+    WrapStyle_Word,     // wrap on word boundaries

 #ifdef __WXMSW__
     TextKind_Plain      // plain EDIT control
 #endif // __WXMSW__
 #ifdef __WXMSW__
     TextKind_Plain      // plain EDIT control
 #endif // __WXMSW__


@@ -113,8 +136,15 @@ class TextWidgetsPage : public WidgetsPage
 {
 public:
     // ctor(s) and dtor
 {
 public:
     // ctor(s) and dtor

-    TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
-    virtual ~TextWidgetsPage();
+    TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+    virtual ~TextWidgetsPage(){};
+
+    virtual wxControl *GetWidget() const { return m_text; }
+    virtual wxTextEntryBase *GetTextEntry() const { return m_text; }
+    virtual void RecreateWidget() { CreateText(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

 
 protected:
     // create an info text contorl
 
 protected:
     // create an info text contorl


@@ -136,10 +166,12 @@ protected:
     void OnButtonClear(wxCommandEvent& event);
     void OnButtonLoad(wxCommandEvent& event);
 
     void OnButtonClear(wxCommandEvent& event);
     void OnButtonLoad(wxCommandEvent& event);
 

+    void OnStreamRedirector(wxCommandEvent& event);

     void OnButtonQuit(wxCommandEvent& event);
 
     void OnText(wxCommandEvent& event);
     void OnTextEnter(wxCommandEvent& event);
     void OnButtonQuit(wxCommandEvent& event);
 
     void OnText(wxCommandEvent& event);
     void OnTextEnter(wxCommandEvent& event);

+    void OnTextPasted(wxClipboardTextEvent& event);

 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 
 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 


@@ -170,10 +202,14 @@ protected:
     // the radiobox to choose between single and multi line
     wxRadioBox *m_radioTextLines;
 
     // the radiobox to choose between single and multi line
     wxRadioBox *m_radioTextLines;
 

+    // and another one to choose the wrapping style
+    wxRadioBox *m_radioWrap;
+

     // the checkboxes controlling text ctrl styles
     wxCheckBox *m_chkPassword,
     // the checkboxes controlling text ctrl styles
     wxCheckBox *m_chkPassword,

-               *m_chkWrapLines,
-               *m_chkReadonly;
+               *m_chkReadonly,
+               *m_chkProcessEnter,
+               *m_chkFilename;

 
     // under MSW we test rich edit controls as well here
 #ifdef __WXMSW__
 
     // under MSW we test rich edit controls as well here
 #ifdef __WXMSW__


@@ -203,7 +239,7 @@ protected:
     wxString m_range10_20;
 
 private:
     wxString m_range10_20;
 
 private:

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

     DECLARE_EVENT_TABLE()
     DECLARE_WIDGETS_PAGE(TextWidgetsPage)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_WIDGETS_PAGE(TextWidgetsPage)
 };


@@ -231,32 +267,32 @@ protected:
         switch ( HitTest(event.GetPosition(), &x, &y) )
         {
             default:
         switch ( HitTest(event.GetPosition(), &x, &y) )
         {
             default:

-                wxFAIL_MSG( _T("unexpected HitTest() result") );
+                wxFAIL_MSG( wxT("unexpected HitTest() result") );

                 // fall through
 
             case wxTE_HT_UNKNOWN:
                 x = y = -1;
                 // fall through
 
             case wxTE_HT_UNKNOWN:
                 x = y = -1;

-                where = _T("nowhere near");
+                where = wxT("nowhere near");

                 break;
 
             case wxTE_HT_BEFORE:
                 break;
 
             case wxTE_HT_BEFORE:

-                where = _T("before");
+                where = wxT("before");

                 break;
 
             case wxTE_HT_BELOW:
                 break;
 
             case wxTE_HT_BELOW:

-                where = _T("below");
+                where = wxT("below");

                 break;
 
             case wxTE_HT_BEYOND:
                 break;
 
             case wxTE_HT_BEYOND:

-                where = _T("beyond");
+                where = wxT("beyond");

                 break;
 
             case wxTE_HT_ON_TEXT:
                 break;
 
             case wxTE_HT_ON_TEXT:

-                where = _T("at");
+                where = wxT("at");

                 break;
         }
 
                 break;
         }
 

-        wxLogMessage(_T("Mouse is %s (%ld, %ld)"), where.c_str(), x, y);
+        wxLogMessage(wxT("Mouse is %s (%ld, %ld)"), where.c_str(), x, y);

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


@@ -274,6 +310,8 @@ BEGIN_EVENT_TABLE(TextWidgetsPage, WidgetsPage)
 
     EVT_BUTTON(TextPage_Reset, TextWidgetsPage::OnButtonReset)
 
 
     EVT_BUTTON(TextPage_Reset, TextWidgetsPage::OnButtonReset)
 

+    EVT_BUTTON(TextPage_StreamRedirector, TextWidgetsPage::OnStreamRedirector)
+

     EVT_BUTTON(TextPage_Clear, TextWidgetsPage::OnButtonClear)
     EVT_BUTTON(TextPage_Set, TextWidgetsPage::OnButtonSet)
     EVT_BUTTON(TextPage_Add, TextWidgetsPage::OnButtonAdd)
     EVT_BUTTON(TextPage_Clear, TextWidgetsPage::OnButtonClear)
     EVT_BUTTON(TextPage_Set, TextWidgetsPage::OnButtonSet)
     EVT_BUTTON(TextPage_Add, TextWidgetsPage::OnButtonAdd)


@@ -289,6 +327,7 @@ BEGIN_EVENT_TABLE(TextWidgetsPage, WidgetsPage)
 
     EVT_TEXT(TextPage_Textctrl, TextWidgetsPage::OnText)
     EVT_TEXT_ENTER(TextPage_Textctrl, TextWidgetsPage::OnTextEnter)
 
     EVT_TEXT(TextPage_Textctrl, TextWidgetsPage::OnText)
     EVT_TEXT_ENTER(TextPage_Textctrl, TextWidgetsPage::OnTextEnter)

+    EVT_TEXT_PASTE(TextPage_Textctrl, TextWidgetsPage::OnTextPasted)

 
     EVT_CHECKBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox)
     EVT_RADIOBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox)
 
     EVT_CHECKBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox)
     EVT_RADIOBOX(wxID_ANY, TextWidgetsPage::OnCheckOrRadioBox)


@@ -302,26 +341,36 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(TextWidgetsPage, _T("Text"));
+#if defined(__WXX11__)
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#elif defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(TextWidgetsPage, wxT("Text"),
+                       FAMILY_CTRLS | EDITABLE_CTRLS
+                       );

 
 // ----------------------------------------------------------------------------
 // TextWidgetsPage creation
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // TextWidgetsPage creation
 // ----------------------------------------------------------------------------
 

-TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
-               : WidgetsPage(notebook)
+TextWidgetsPage::TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist)
+               : WidgetsPage(book, imaglist, text_xpm)

 {
 {

-    imaglist->Add(wxBitmap(text_xpm));
-

     // init everything
 #ifdef __WXMSW__
     m_radioKind =
 #endif // __WXMSW__
     // init everything
 #ifdef __WXMSW__
     m_radioKind =
 #endif // __WXMSW__

+    m_radioWrap =

     m_radioTextLines = (wxRadioBox *)NULL;
 
     m_chkPassword =
     m_radioTextLines = (wxRadioBox *)NULL;
 
     m_chkPassword =

-    m_chkWrapLines =
-    m_chkReadonly = (wxCheckBox *)NULL;
+    m_chkReadonly =
+    m_chkProcessEnter =
+    m_chkFilename = (wxCheckBox *)NULL;

 
     m_text =
     m_textPosCur =
 
     m_text =
     m_textPosCur =


@@ -339,16 +388,19 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
     m_posLast =
     m_selFrom =
     m_selTo = -2; // not -1 which means "no selection"
     m_posLast =
     m_selFrom =
     m_selTo = -2; // not -1 which means "no selection"

+}

 
 

+void TextWidgetsPage::CreateContent()
+{

     // left pane
     static const wxString modes[] =
     {
     // left pane
     static const wxString modes[] =
     {

-        _T("single line"),
-        _T("multi line"),
+        wxT("single line"),
+        wxT("multi line"),

     };
 
     };
 

-    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set textctrl parameters"));
-    m_radioTextLines = new wxRadioBox(this, wxID_ANY, _T("&Number of lines:"),
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set textctrl parameters"));
+    m_radioTextLines = new wxRadioBox(this, wxID_ANY, wxT("&Number of lines:"),

                                       wxDefaultPosition, wxDefaultSize,
                                       WXSIZEOF(modes), modes,
                                       1, wxRA_SPECIFY_COLS);
                                       wxDefaultPosition, wxDefaultSize,
                                       WXSIZEOF(modes), modes,
                                       1, wxRA_SPECIFY_COLS);


@@ -356,59 +408,81 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
     sizerLeft->Add(m_radioTextLines, 0, wxGROW | wxALL, 5);
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
     sizerLeft->Add(m_radioTextLines, 0, wxGROW | wxALL, 5);

-    sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
+    sizerLeft->AddSpacer(5);

 
     m_chkPassword = CreateCheckBoxAndAddToSizer(
 
     m_chkPassword = CreateCheckBoxAndAddToSizer(

-                        sizerLeft, _T("&Password control"), TextPage_Password
+                        sizerLeft, wxT("&Password control"), TextPage_Password

                     );
                     );

-    m_chkWrapLines = CreateCheckBoxAndAddToSizer(
-                        sizerLeft, _T("Line &wrap"), TextPage_WrapLines
-                     );

     m_chkReadonly = CreateCheckBoxAndAddToSizer(
     m_chkReadonly = CreateCheckBoxAndAddToSizer(

-                        sizerLeft, _T("&Read-only mode")
+                        sizerLeft, wxT("&Read-only mode")
+                    );
+    m_chkProcessEnter = CreateCheckBoxAndAddToSizer(
+                        sizerLeft, wxT("Process &Enter")

                     );
                     );

+    m_chkFilename = CreateCheckBoxAndAddToSizer(
+                        sizerLeft, wxT("&Filename control")
+                    );
+    m_chkFilename->Disable(); // not implemented yet
+    sizerLeft->AddSpacer(5);
+
+    static const wxString wrap[] =
+    {
+        wxT("no wrap"),
+        wxT("word wrap"),
+        wxT("char wrap"),
+        wxT("best wrap"),
+    };
+
+    m_radioWrap = new wxRadioBox(this, wxID_ANY, wxT("&Wrap style:"),
+                                 wxDefaultPosition, wxDefaultSize,
+                                 WXSIZEOF(wrap), wrap,
+                                 1, wxRA_SPECIFY_COLS);
+    sizerLeft->Add(m_radioWrap, 0, wxGROW | wxALL, 5);

 
 #ifdef __WXMSW__
     static const wxString kinds[] =
     {
 
 #ifdef __WXMSW__
     static const wxString kinds[] =
     {

-        _T("plain edit"),
-        _T("rich edit"),
-        _T("rich edit 2.0"),
+        wxT("plain edit"),
+        wxT("rich edit"),
+        wxT("rich edit 2.0"),

     };
 
     };
 

-    m_radioKind = new wxRadioBox(this, wxID_ANY, _T("Control &kind"),
+    m_radioKind = new wxRadioBox(this, wxID_ANY, wxT("Control &kind"),

                                  wxDefaultPosition, wxDefaultSize,
                                  WXSIZEOF(kinds), kinds,
                                  1, wxRA_SPECIFY_COLS);
 
                                  wxDefaultPosition, wxDefaultSize,
                                  WXSIZEOF(kinds), kinds,
                                  1, wxRA_SPECIFY_COLS);
 

-    sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
+    sizerLeft->AddSpacer(5);

     sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);
 #endif // __WXMSW__
 
     sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);
 #endif // __WXMSW__
 

-    wxButton *btn = new wxButton(this, TextPage_Reset, _T("&Reset"));
+    wxButton *btn = new wxButton(this, TextPage_Reset, wxT("&Reset"));

     sizerLeft->Add(2, 2, 0, wxGROW | wxALL, 1); // spacer
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(2, 2, 0, wxGROW | wxALL, 1); // spacer
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Change contents:"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change contents:"));

     wxSizer *sizerMiddleUp = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerMiddleUp = new wxStaticBoxSizer(box2, wxVERTICAL);
 

-    btn = new wxButton(this, TextPage_Set, _T("&Set text value"));
+    btn = new wxButton(this, TextPage_Set, wxT("&Set text value"));

     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 

-    btn = new wxButton(this, TextPage_Add, _T("&Append text"));
+    btn = new wxButton(this, TextPage_Add, wxT("&Append text"));

     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 

-    btn = new wxButton(this, TextPage_Insert, _T("&Insert text"));
+    btn = new wxButton(this, TextPage_Insert, wxT("&Insert text"));

     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 

-    btn = new wxButton(this, TextPage_Load, _T("&Load file"));
+    btn = new wxButton(this, TextPage_Load, wxT("&Load file"));

     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 

-    btn = new wxButton(this, TextPage_Clear, _T("&Clear"));
+    btn = new wxButton(this, TextPage_Clear, wxT("&Clear"));

     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 

-    wxStaticBox *box4 = new wxStaticBox(this, wxID_ANY, _T("&Info:"));
+    btn = new wxButton(this, TextPage_StreamRedirector, wxT("St&ream redirection"));
+    sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
+
+    wxStaticBox *box4 = new wxStaticBox(this, wxID_ANY, wxT("&Info:"));

     wxSizer *sizerMiddleDown = new wxStaticBoxSizer(box4, wxVERTICAL);
 
     m_textPosCur = CreateInfoText();
     wxSizer *sizerMiddleDown = new wxStaticBoxSizer(box4, wxVERTICAL);
 
     m_textPosCur = CreateInfoText();


@@ -418,19 +492,19 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
     wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
     sizerRow->Add(CreateTextWithLabelSizer
                   (
     wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
     sizerRow->Add(CreateTextWithLabelSizer
                   (

-                    _T("Current pos:"),
+                    wxT("Current pos:"),

                     m_textPosCur
                   ),
                   0, wxRIGHT, 5);
     sizerRow->Add(CreateTextWithLabelSizer
                   (
                     m_textPosCur
                   ),
                   0, wxRIGHT, 5);
     sizerRow->Add(CreateTextWithLabelSizer
                   (

-                    _T("Col:"),
+                    wxT("Col:"),

                     m_textColCur
                   ),
                   0, wxLEFT | wxRIGHT, 5);
     sizerRow->Add(CreateTextWithLabelSizer
                   (
                     m_textColCur
                   ),
                   0, wxLEFT | wxRIGHT, 5);
     sizerRow->Add(CreateTextWithLabelSizer
                   (

-                    _T("Row:"),
+                    wxT("Row:"),

                     m_textRowCur
                   ),
                   0, wxLEFT, 5);
                     m_textRowCur
                   ),
                   0, wxLEFT, 5);


@@ -442,9 +516,9 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
                      (
                         CreateTextWithLabelSizer
                         (
                      (
                         CreateTextWithLabelSizer
                         (

-                          _T("Number of lines:"),
+                          wxT("Number of lines:"),

                           m_textLineLast,
                           m_textLineLast,

-                          _T("Last position:"),
+                          wxT("Last position:"),

                           m_textPosLast
                         ),
                         0, wxALL, 5
                           m_textPosLast
                         ),
                         0, wxALL, 5


@@ -456,9 +530,9 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
                      (
                         CreateTextWithLabelSizer
                         (
                      (
                         CreateTextWithLabelSizer
                         (

-                          _T("Selection: from"),
+                          wxT("Selection: from"),

                           m_textSelFrom,
                           m_textSelFrom,

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

                           m_textSelTo
                         ),
                         0, wxALL, 5
                           m_textSelTo
                         ),
                         0, wxALL, 5


@@ -471,7 +545,7 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
                      (
                         CreateTextWithLabelSizer
                         (
                      (
                         CreateTextWithLabelSizer
                         (

-                          _T("Range 10..20:"),
+                          wxT("Range 10..20:"),

                           m_textRange
                         ),
                         0, wxALL, 5
                           m_textRange
                         ),
                         0, wxALL, 5


@@ -482,7 +556,7 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
     sizerMiddle->Add(sizerMiddleDown, 1, wxGROW | wxTOP, 5);
 
     // right pane
     sizerMiddle->Add(sizerMiddleDown, 1, wxGROW | wxTOP, 5);
 
     // right pane

-    wxStaticBox *box3 = new wxStaticBox(this, wxID_ANY, _T("&Text:"));
+    wxStaticBox *box3 = new wxStaticBox(this, wxID_ANY, wxT("&Text:"));

     m_sizerText = new wxStaticBoxSizer(box3, wxHORIZONTAL);
     Reset();
     CreateText();
     m_sizerText = new wxStaticBoxSizer(box3, wxHORIZONTAL);
     Reset();
     CreateText();


@@ -495,12 +569,6 @@ TextWidgetsPage::TextWidgetsPage(wxNotebook *notebook, wxImageList *imaglist)
     sizerTop->Add(m_sizerText, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     SetSizer(sizerTop);
     sizerTop->Add(m_sizerText, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);
-}
-
-TextWidgetsPage::~TextWidgetsPage()
-{

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


@@ -513,12 +581,12 @@ wxTextCtrl *TextWidgetsPage::CreateInfoText()
     if ( !s_maxWidth )
     {
         // calc it once only
     if ( !s_maxWidth )
     {
         // calc it once only

-        GetTextExtent(_T("9999999"), &s_maxWidth, NULL);
+        GetTextExtent(wxT("9999999"), &s_maxWidth, NULL);

     }
 
     wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                                       wxDefaultPosition,
     }
 
     wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
                                       wxDefaultPosition,

-                                      wxSize(s_maxWidth, -1),
+                                      wxSize(s_maxWidth, wxDefaultCoord),

                                       wxTE_READONLY);
     return text;
 }
                                       wxTE_READONLY);
     return text;
 }


@@ -549,9 +617,14 @@ wxSizer *TextWidgetsPage::CreateTextWithLabelSizer(const wxString& label,
 void TextWidgetsPage::Reset()
 {
     m_radioTextLines->SetSelection(DEFAULTS.textLines);
 void TextWidgetsPage::Reset()
 {
     m_radioTextLines->SetSelection(DEFAULTS.textLines);

+

     m_chkPassword->SetValue(DEFAULTS.password);
     m_chkPassword->SetValue(DEFAULTS.password);

-    m_chkWrapLines->SetValue(DEFAULTS.wraplines);

     m_chkReadonly->SetValue(DEFAULTS.readonly);
     m_chkReadonly->SetValue(DEFAULTS.readonly);

+    m_chkProcessEnter->SetValue(DEFAULTS.processEnter);
+    m_chkFilename->SetValue(DEFAULTS.filename);
+
+    m_radioWrap->SetSelection(DEFAULTS.wrapStyle);
+

 #ifdef __WXMSW__
     m_radioKind->SetSelection(DEFAULTS.textKind);
 #endif // __WXMSW__
 #ifdef __WXMSW__
     m_radioKind->SetSelection(DEFAULTS.textKind);
 #endif // __WXMSW__


@@ -559,11 +632,11 @@ void TextWidgetsPage::Reset()
 
 void TextWidgetsPage::CreateText()
 {
 
 void TextWidgetsPage::CreateText()
 {

-    int flags = 0;
+    int flags = ms_defaultFlags;

     switch ( m_radioTextLines->GetSelection() )
     {
         default:
     switch ( m_radioTextLines->GetSelection() )
     {
         default:

-            wxFAIL_MSG( _T("unexpected lines radio box selection") );
+            wxFAIL_MSG( wxT("unexpected lines radio box selection") );

 
         case TextLines_Single:
             break;
 
         case TextLines_Single:
             break;


@@ -578,14 +651,37 @@ void TextWidgetsPage::CreateText()
         flags |= wxTE_PASSWORD;
     if ( m_chkReadonly->GetValue() )
         flags |= wxTE_READONLY;
         flags |= wxTE_PASSWORD;
     if ( m_chkReadonly->GetValue() )
         flags |= wxTE_READONLY;

-    if ( !m_chkWrapLines->GetValue() )
-        flags |= wxHSCROLL;
+    if ( m_chkProcessEnter->GetValue() )
+        flags |= wxTE_PROCESS_ENTER;
+
+    switch ( m_radioWrap->GetSelection() )
+    {
+        default:
+            wxFAIL_MSG( wxT("unexpected wrap style radio box selection") );
+
+        case WrapStyle_None:
+            flags |= wxTE_DONTWRAP; // same as wxHSCROLL
+            break;
+
+        case WrapStyle_Word:
+            flags |= wxTE_WORDWRAP;
+            break;
+
+        case WrapStyle_Char:
+            flags |= wxTE_CHARWRAP;
+            break;
+
+        case WrapStyle_Best:
+            // this is default but use symbolic file name for consistency
+            flags |= wxTE_BESTWRAP;
+            break;
+    }

 
 #ifdef __WXMSW__
     switch ( m_radioKind->GetSelection() )
     {
         default:
 
 #ifdef __WXMSW__
     switch ( m_radioKind->GetSelection() )
     {
         default:

-            wxFAIL_MSG( _T("unexpected kind radio box selection") );
+            wxFAIL_MSG( wxT("unexpected kind radio box selection") );

 
         case TextKind_Plain:
             break;
 
         case TextKind_Plain:
             break;


@@ -610,11 +706,16 @@ void TextWidgetsPage::CreateText()
     }
     else
     {
     }
     else
     {

-        valueOld = _T("Hello, Universe!");
+        valueOld = wxT("Hello, Universe!");

     }
 
     m_text = new WidgetsTextCtrl(this, TextPage_Textctrl, valueOld, flags);
 
     }
 
     m_text = new WidgetsTextCtrl(this, TextPage_Textctrl, valueOld, flags);
 

+#if 0
+    if ( m_chkFilename->GetValue() )
+        ;
+#endif // TODO
+

     // cast to int needed to silence gcc warning about different enums
     m_sizerText->Add(m_text, 1, wxALL |
                      (flags & wxTE_MULTILINE ? (int)wxGROW
     // cast to int needed to silence gcc warning about different enums
     m_sizerText->Add(m_text, 1, wxALL |
                      (flags & wxTE_MULTILINE ? (int)wxGROW


@@ -665,7 +766,7 @@ void TextWidgetsPage::OnIdle(wxIdleEvent& WXUNUSED(event))
     if ( m_textLineLast )
     {
         m_textLineLast->SetValue(
     if ( m_textLineLast )
     {
         m_textLineLast->SetValue(

-                wxString::Format(_T("%d"), m_text->GetNumberOfLines()) );
+                wxString::Format(wxT("%d"), m_text->GetNumberOfLines()) );

     }
 
     if ( m_textSelFrom && m_textSelTo )
     }
 
     if ( m_textSelFrom && m_textSelTo )


@@ -710,8 +811,8 @@ void TextWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
 void TextWidgetsPage::OnButtonSet(wxCommandEvent& WXUNUSED(event))
 {
     m_text->SetValue(m_text->GetWindowStyle() & wxTE_MULTILINE
 void TextWidgetsPage::OnButtonSet(wxCommandEvent& WXUNUSED(event))
 {
     m_text->SetValue(m_text->GetWindowStyle() & wxTE_MULTILINE

-                        ? _T("Here,\nthere and\neverywhere")
-                        : _T("Yellow submarine"));
+                        ? wxT("Here,\nthere and\neverywhere")
+                        : wxT("Yellow submarine"));

 
     m_text->SetFocus();
 }
 
     m_text->SetFocus();
 }


@@ -720,18 +821,18 @@ void TextWidgetsPage::OnButtonAdd(wxCommandEvent& WXUNUSED(event))
 {
     if ( m_text->GetWindowStyle() & wxTE_MULTILINE )
     {
 {
     if ( m_text->GetWindowStyle() & wxTE_MULTILINE )
     {

-        m_text->AppendText(_T("We all live in a\n"));
+        m_text->AppendText(wxT("We all live in a\n"));

     }
 
     }
 

-    m_text->AppendText(_T("Yellow submarine"));
+    m_text->AppendText(wxT("Yellow submarine"));

 }
 
 void TextWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void TextWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event))
 {

-    m_text->WriteText(_T("Is there anybody going to listen to my story"));
+    m_text->WriteText(wxT("Is there anybody going to listen to my story"));

     if ( m_text->GetWindowStyle() & wxTE_MULTILINE )
     {
     if ( m_text->GetWindowStyle() & wxTE_MULTILINE )
     {

-        m_text->WriteText(_T("\nall about the girl who came to stay"));
+        m_text->WriteText(wxT("\nall about the girl who came to stay"));

     }
 }
 
     }
 }
 


@@ -745,14 +846,14 @@ void TextWidgetsPage::OnButtonLoad(wxCommandEvent& WXUNUSED(event))
 {
     // search for the file in several dirs where it's likely to be
     wxPathList pathlist;
 {
     // search for the file in several dirs where it's likely to be
     wxPathList pathlist;

-    pathlist.Add(_T("."));
-    pathlist.Add(_T(".."));
-    pathlist.Add(_T("../../../samples/widgets"));
+    pathlist.Add(wxT("."));
+    pathlist.Add(wxT(".."));
+    pathlist.Add(wxT("../../../samples/widgets"));

 
 

-    wxString filename = pathlist.FindValidPath(_T("textctrl.cpp"));
+    wxString filename = pathlist.FindValidPath(wxT("textctrl.cpp"));

     if ( !filename )
     {
     if ( !filename )
     {

-        wxLogError(_T("File textctrl.cpp not found."));
+        wxLogError(wxT("File textctrl.cpp not found."));

     }
     else // load it
     {
     }
     else // load it
     {


@@ -760,12 +861,12 @@ void TextWidgetsPage::OnButtonLoad(wxCommandEvent& WXUNUSED(event))
         if ( !m_text->LoadFile(filename) )
         {
             // this is not supposed to happen ...
         if ( !m_text->LoadFile(filename) )
         {
             // this is not supposed to happen ...

-            wxLogError(_T("Error loading file."));
+            wxLogError(wxT("Error loading file."));

         }
         else
         {
             long elapsed = sw.Time();
         }
         else
         {
             long elapsed = sw.Time();

-            wxLogMessage(_T("Loaded file '%s' in %lu.%us"),
+            wxLogMessage(wxT("Loaded file '%s' in %lu.%us"),

                          filename.c_str(), elapsed / 1000,
                          (unsigned int) elapsed % 1000);
         }
                          filename.c_str(), elapsed / 1000,
                          (unsigned int) elapsed % 1000);
         }


@@ -794,9 +895,11 @@ void TextWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 #ifdef __WXMSW__
                   (m_radioKind->GetSelection() != DEFAULTS.textKind) ||
 #endif // __WXMSW__
 #ifdef __WXMSW__
                   (m_radioKind->GetSelection() != DEFAULTS.textKind) ||
 #endif // __WXMSW__

-                  (m_chkReadonly->GetValue() != DEFAULTS.readonly) ||

                   (m_chkPassword->GetValue() != DEFAULTS.password) ||
                   (m_chkPassword->GetValue() != DEFAULTS.password) ||

-                  (m_chkWrapLines->GetValue() != DEFAULTS.wraplines) );
+                  (m_chkReadonly->GetValue() != DEFAULTS.readonly) ||
+                  (m_chkProcessEnter->GetValue() != DEFAULTS.processEnter) ||
+                  (m_chkFilename->GetValue() != DEFAULTS.filename) ||
+                  (m_radioWrap->GetSelection() != DEFAULTS.wrapStyle) );

 }
 
 void TextWidgetsPage::OnText(wxCommandEvent& WXUNUSED(event))
 }
 
 void TextWidgetsPage::OnText(wxCommandEvent& WXUNUSED(event))


@@ -811,12 +914,19 @@ void TextWidgetsPage::OnText(wxCommandEvent& WXUNUSED(event))
         return;
     }
 
         return;
     }
 

-    wxLogMessage(_T("Text ctrl value changed"));
+    wxLogMessage(wxT("Text ctrl value changed"));

 }
 
 void TextWidgetsPage::OnTextEnter(wxCommandEvent& event)
 {
 }
 
 void TextWidgetsPage::OnTextEnter(wxCommandEvent& event)
 {

-    wxLogMessage(_T("Text entered: '%s'"), event.GetString().c_str());
+    wxLogMessage(wxT("Text entered: '%s'"), event.GetString().c_str());
+    event.Skip();
+}
+
+void TextWidgetsPage::OnTextPasted(wxClipboardTextEvent& event)
+{
+    wxLogMessage("Text pasted from clipboard.");
+    event.Skip();

 }
 
 void TextWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
 }
 
 void TextWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))


@@ -824,3 +934,13 @@ void TextWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
     CreateText();
 }
 
     CreateText();
 }
 

+void TextWidgetsPage::OnStreamRedirector(wxCommandEvent& WXUNUSED(event))
+{
+#if wxHAS_TEXT_WINDOW_STREAM
+    wxStreamToTextRedirector redirect(m_text);
+    wxString str( wxT("Outputed to cout, appears in wxTextCtrl!") );
+    wxSTD cout << str << wxSTD endl;
+#else
+    wxMessageBox(wxT("This wxWidgets build does not support wxStreamToTextRedirector"));
+#endif
+}