fixed another return FALSE in a function returning a pointer (patch 545046)

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index b828f7529482d1dee7ceb0ff0d6e79afa38d549d..5eadd8e01812f50ed79c398b4ee53783686b53ff 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -28,9 +28,9 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include <stdio.h>
+#if wxUSE_TEXTDLG
 
+#ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/button.h"
@@ -60,13 +60,11 @@ static const int wxID_TEXT = 3000;
 // wxTextEntryDialog
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
-#endif
 
 wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& message,
@@ -82,14 +80,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
@@ -99,11 +99,12 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     // 4) buttons
     topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
-    
+
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
+
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
-    SetSizer( topsizer );
-    SetAutoLayout( TRUE );
 
     Centre( wxBOTH );
 
@@ -118,3 +119,12 @@ void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 
     EndModal(wxID_OK);
 }
+
+void wxTextEntryDialog::SetValue(const wxString& val)
+{
+    m_value = val;
+
+    m_textctrl->SetValue(val);
+}
+
+#endif // wxUSE_TEXTDLG