From cd644aa10f219a8b5690d21a84c27f393d743ac1 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Tue, 13 Oct 2009 14:34:47 +0000 Subject: [PATCH] Removed wxTE_READONLY style from multi-line wxTextCtrls in combo and propgrid samples (looks a bit better that way on wxMSW) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/combo/combo.cpp | 11 ++++++----- samples/propgrid/tests.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp index 2de27dd..288fbc2 100644 --- a/samples/combo/combo.cpp +++ b/samples/combo/combo.cpp @@ -743,11 +743,12 @@ MyFrame::MyFrame(const wxString& title) wxPanel* panel = new wxPanel(this); // Prepare log window right away since it shows EVT_TEXTs - m_logWin = new wxTextCtrl( panel, 105, wxEmptyString, wxDefaultPosition, - wxSize(-1,125), wxTE_MULTILINE|wxFULL_REPAINT_ON_RESIZE ); - m_logWin->SetEditable(false); - wxLogTextCtrl* logger = new wxLogTextCtrl( m_logWin ); - m_logOld = logger->SetActiveTarget( logger ); + m_logWin = new wxTextCtrl(panel, 105, wxEmptyString, + wxDefaultPosition, + wxSize(-1, 125), + wxTE_MULTILINE); + wxLogTextCtrl* logger = new wxLogTextCtrl(m_logWin); + m_logOld = logger->SetActiveTarget(logger); logger->DisableTimestamp(); diff --git a/samples/propgrid/tests.cpp b/samples/propgrid/tests.cpp index 8efbe0f..ebd8e88 100644 --- a/samples/propgrid/tests.cpp +++ b/samples/propgrid/tests.cpp @@ -162,8 +162,9 @@ void FormMain::OnDumpList( wxCommandEvent& WXUNUSED(event) ) const int spacing = 8; wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL ); - wxTextCtrl* ed = new wxTextCtrl(dlg,11,text, - wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY); + wxTextCtrl* ed = new wxTextCtrl(dlg, 11, text, + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE); rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing ); topsizer->Add( rowsizer, 1, wxEXPAND, 0 ); rowsizer = new wxBoxSizer( wxHORIZONTAL ); @@ -342,8 +343,9 @@ bool FormMain::RunTests( bool fullTest, bool interactive ) const int spacing = 8; wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL ); - wxTextCtrl* ed = new wxTextCtrl(dlg,11,wxEmptyString, - wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY); + wxTextCtrl* ed = new wxTextCtrl(dlg, 11, wxEmptyString, + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE); rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing ); topsizer->Add( rowsizer, 1, wxEXPAND, 0 ); rowsizer = new wxBoxSizer( wxHORIZONTAL ); -- 2.7.4