Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed wxTE_READONLY style from multi-line wxTextCtrls in combo and propgrid samples (looks a bit better that way on wxMSW)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-10-13 14:34:47 +00:00
parent f115ff4a4f
commit cd644aa10f
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/combo/combo.cpp
View File

@@ -743,11 +743,12 @@ MyFrame::MyFrame(const wxString& title)
wxPanel* panel = new wxPanel(this); wxPanel* panel = new wxPanel(this);
// Prepare log window right away since it shows EVT_TEXTs // Prepare log window right away since it shows EVT_TEXTs
m_logWin = new wxTextCtrl( panel, 105, wxEmptyString, wxDefaultPosition, m_logWin = new wxTextCtrl(panel, 105, wxEmptyString,
wxSize(-1,125), wxTE_MULTILINE|wxFULL_REPAINT_ON_RESIZE ); wxDefaultPosition,
m_logWin->SetEditable(false); wxSize(-1, 125),
wxLogTextCtrl* logger = new wxLogTextCtrl( m_logWin ); wxTE_MULTILINE);
m_logOld = logger->SetActiveTarget( logger ); wxLogTextCtrl* logger = new wxLogTextCtrl(m_logWin);
m_logOld = logger->SetActiveTarget(logger);
logger->DisableTimestamp(); logger->DisableTimestamp();

10
samples/propgrid/tests.cpp
View File

@@ -162,8 +162,9 @@ void FormMain::OnDumpList( wxCommandEvent& WXUNUSED(event) )
const int spacing = 8; const int spacing = 8;
wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
wxTextCtrl* ed = new wxTextCtrl(dlg,11,text, wxTextCtrl* ed = new wxTextCtrl(dlg, 11, text,
wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY); wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE);
rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing ); rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
topsizer->Add( rowsizer, 1, wxEXPAND, 0 ); topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
rowsizer = new wxBoxSizer( wxHORIZONTAL ); rowsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -342,8 +343,9 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
const int spacing = 8; const int spacing = 8;
wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
wxTextCtrl* ed = new wxTextCtrl(dlg,11,wxEmptyString, wxTextCtrl* ed = new wxTextCtrl(dlg, 11, wxEmptyString,
wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY); wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE);
rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing ); rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
topsizer->Add( rowsizer, 1, wxEXPAND, 0 ); topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
rowsizer = new wxBoxSizer( wxHORIZONTAL ); rowsizer = new wxBoxSizer( wxHORIZONTAL );