cleaned up the waitpid() result processing mess

[wxWidgets.git] / src / generic / textdlgg.cpp

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index e5e86c96e1e7506a846bb3ec2366c29056b20e62..9b6a5b965efdde7d256432afdd4f80bc4be58696 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TEXTDLG
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -87,7 +89,9 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
 
     // 2) text ctrl
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
 
     // 2) text ctrl

-    m_textctrl = new wxTextCtrl(this, wxID_TEXT, value, wxDefaultPosition, wxSize(300, -1));
+    m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
+                                wxDefaultPosition, wxSize(300, -1),
+                                style & ~wxTextEntryDialogStyle);

     topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
 
 #if wxUSE_STATLINE
     topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
 
 #if wxUSE_STATLINE


@@ -117,3 +121,5 @@ void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 
     EndModal(wxID_OK);
 }
 
     EndModal(wxID_OK);
 }

+
+#endif // wxUSE_TEXTDLG