Border correction

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

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 21a4f36f7c20cab2d0c1d15c3b42a3e62df555d4..e3f6c7845ed9f13e06bcb11d3c1267e0bd0ca819 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -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,13 @@ 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 filename;
+
+    WrapStyle wrapStyle;
+

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


@@ -97,8 +117,9 @@ 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

+    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,10 +134,14 @@ class TextWidgetsPage : public WidgetsPage
 {
 public:
     // ctor(s) and dtor
 {
 public:
     // ctor(s) and dtor

-    TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    TextWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

     virtual ~TextWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_text; }
     virtual ~TextWidgetsPage(){};
 
     virtual wxControl *GetWidget() 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


@@ -138,6 +163,7 @@ 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 OnButtonQuit(wxCommandEvent& event);
 
     void OnText(wxCommandEvent& event);


@@ -172,10 +198,13 @@ 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_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__


@@ -276,6 +305,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)


@@ -304,26 +335,35 @@ 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, _T("Text"),
+                       FAMILY_CTRLS | EDITABLE_CTRLS
+                       );

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

-TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist)
-               : WidgetsPage(book)
+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_chkFilename = (wxCheckBox *)NULL;

 
     m_text =
     m_textPosCur =
 
     m_text =
     m_textPosCur =


@@ -341,7 +381,10 @@ TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, 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[] =
     {


@@ -358,17 +401,33 @@ TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, 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(
                         sizerLeft, _T("&Password control"), TextPage_Password
                     );
 
     m_chkPassword = CreateCheckBoxAndAddToSizer(
                         sizerLeft, _T("&Password control"), TextPage_Password
                     );

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

     m_chkReadonly = CreateCheckBoxAndAddToSizer(
                         sizerLeft, _T("&Read-only mode")
                     );
     m_chkReadonly = CreateCheckBoxAndAddToSizer(
                         sizerLeft, _T("&Read-only mode")
                     );

+    m_chkFilename = CreateCheckBoxAndAddToSizer(
+                        sizerLeft, _T("&Filename control")
+                    );
+    m_chkFilename->Disable(); // not implemented yet
+    sizerLeft->AddSpacer(5);
+
+    static const wxString wrap[] =
+    {
+        _T("no wrap"),
+        _T("word wrap"),
+        _T("char wrap"),
+        _T("best wrap"),
+    };
+
+    m_radioWrap = new wxRadioBox(this, wxID_ANY, _T("&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[] =


@@ -383,7 +442,7 @@ TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist)
                                  WXSIZEOF(kinds), kinds,
                                  1, wxRA_SPECIFY_COLS);
 
                                  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__
 


@@ -410,6 +469,9 @@ TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, wxImageList *imaglist)
     btn = new wxButton(this, TextPage_Clear, _T("&Clear"));
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 
     btn = new wxButton(this, TextPage_Clear, _T("&Clear"));
     sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
 

+    btn = new wxButton(this, TextPage_StreamRedirector, _T("St&ream redirection"));
+    sizerMiddleUp->Add(btn, 0, wxALL | wxGROW, 1);
+

     wxStaticBox *box4 = new wxStaticBox(this, wxID_ANY, _T("&Info:"));
     wxSizer *sizerMiddleDown = new wxStaticBoxSizer(box4, wxVERTICAL);
 
     wxStaticBox *box4 = new wxStaticBox(this, wxID_ANY, _T("&Info:"));
     wxSizer *sizerMiddleDown = new wxStaticBoxSizer(box4, wxVERTICAL);
 


@@ -497,8 +559,6 @@ TextWidgetsPage::TextWidgetsPage(wxBookCtrl *book, 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);

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


@@ -516,7 +576,7 @@ wxTextCtrl *TextWidgetsPage::CreateInfoText()
 
     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;
 }


@@ -547,9 +607,13 @@ 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_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__


@@ -557,7 +621,7 @@ 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:


@@ -576,8 +640,29 @@ 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;
+
+    switch ( m_radioWrap->GetSelection() )
+    {
+        default:
+            wxFAIL_MSG( _T("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() )
 
 #ifdef __WXMSW__
     switch ( m_radioKind->GetSelection() )


@@ -613,6 +698,11 @@ void TextWidgetsPage::CreateText()
 
     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


@@ -792,9 +882,10 @@ 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_chkFilename->GetValue() != DEFAULTS.filename) ||
+                  (m_radioWrap->GetSelection() != DEFAULTS.wrapStyle) );

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


@@ -815,6 +906,7 @@ void TextWidgetsPage::OnText(wxCommandEvent& WXUNUSED(event))
 void TextWidgetsPage::OnTextEnter(wxCommandEvent& event)
 {
     wxLogMessage(_T("Text entered: '%s'"), event.GetString().c_str());
 void TextWidgetsPage::OnTextEnter(wxCommandEvent& event)
 {
     wxLogMessage(_T("Text entered: '%s'"), event.GetString().c_str());

+    event.Skip();

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


@@ -822,3 +914,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( _T("Outputed to cout, appears in wxTextCtrl!") );
+    wxSTD cout << str << wxSTD endl;
+#else
+    wxMessageBox(_T("This wxWidgets build does not support wxStreamToTextRedirector"));
+#endif
+}