applied (slightly modified) wxGLApp patch for MSW

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index cee822d7afd75f0adafd4e3e2b28eebb8ce2dfb3..9b6a5b965efdde7d256432afdd4f80bc4be58696 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TEXTDLG
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
 
@@ -80,14 +82,16 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     m_value = value;
 
     wxBeginBusyCursor();
-    
+
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
     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
@@ -97,10 +101,10 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     // 4) buttons
     topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
-    
+
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
-    
+
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
@@ -117,3 +121,5 @@ void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 
     EndModal(wxID_OK);
 }
+
+#endif // wxUSE_TEXTDLG