X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b17ba727c69f66dfa0a73dfdd04ff7d30e3c188..2c8e47380ebbcb5764307d4a8b15e84d8ce74ccf:/src/generic/textdlgg.cpp diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp index 40ca7ba6a3..d34210a7c9 100644 --- a/src/generic/textdlgg.cpp +++ b/src/generic/textdlgg.cpp @@ -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,10 +99,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 );