fixing infinite recursion for rotated text, introduced in cleanup r57915

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

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index 7d0536507ac3ad38669a0cf7e39714047949a029..f0ad274d1baca8d0aa3ae7d311a5509e2abe9bfe 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -138,6 +138,7 @@ public:
     virtual ~TextWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_text; }
     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 RecreateWidget() { CreateText(); }
 
     // lazy creation of the content


@@ -412,6 +413,7 @@ void TextWidgetsPage::CreateContent()
     m_chkFilename = CreateCheckBoxAndAddToSizer(
                         sizerLeft, _T("&Filename control")
                     );
     m_chkFilename = CreateCheckBoxAndAddToSizer(
                         sizerLeft, _T("&Filename control")
                     );

+    m_chkFilename->Disable(); // not implemented yet

     sizerLeft->AddSpacer(5);
 
     static const wxString wrap[] =
     sizerLeft->AddSpacer(5);
 
     static const wxString wrap[] =


@@ -558,8 +560,6 @@ void TextWidgetsPage::CreateContent()
     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);

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


@@ -641,8 +641,6 @@ 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_chkFilename->GetValue() )
-        flags |= wxTE_FILENAME;

 
     switch ( m_radioWrap->GetSelection() )
     {
 
     switch ( m_radioWrap->GetSelection() )
     {


@@ -701,6 +699,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