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

No changes, just make it easier to tweak splitter sample.

Browse Source 
The sample contains disabled code for using other type of windows than
MyCanvas for the splitter children but it didn't compile any more because the
variables were declared as wxScrolledWindow. Fix this by using just wxWindow
for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-04 23:51:58 +00:00
parent c2d4b6971f
commit 5c299305d4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/splitter/splitter.cpp
View File

@@ -111,7 +111,7 @@ public:
void OnUpdateUIInvisible(wxUpdateUIEvent& event); void OnUpdateUIInvisible(wxUpdateUIEvent& event);
private: private:
wxScrolledWindow *m_left, *m_right; wxWindow *m_left, *m_right;
wxSplitterWindow* m_splitter; wxSplitterWindow* m_splitter;
wxWindow *m_replacewindow; wxWindow *m_replacewindow;
@@ -276,12 +276,10 @@ MyFrame::MyFrame()
#if 1 #if 1
m_left = new MyCanvas(m_splitter, true); m_left = new MyCanvas(m_splitter, true);
m_left->SetBackgroundColour(*wxRED); m_left->SetBackgroundColour(*wxRED);
m_left->SetScrollbars(20, 20, 5, 5);
m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER)); m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
m_right = new MyCanvas(m_splitter, false); m_right = new MyCanvas(m_splitter, false);
m_right->SetBackgroundColour(*wxCYAN); m_right->SetBackgroundColour(*wxCYAN);
m_right->SetScrollbars(20, 20, 5, 5);
#else // for testing kbd navigation inside the splitter #else // for testing kbd navigation inside the splitter
m_left = new wxTextCtrl(m_splitter, wxID_ANY, wxT("first text")); m_left = new wxTextCtrl(m_splitter, wxID_ANY, wxT("first text"));
m_right = new wxTextCtrl(m_splitter, wxID_ANY, wxT("second text")); m_right = new wxTextCtrl(m_splitter, wxID_ANY, wxT("second text"));
@@ -537,6 +535,7 @@ MyCanvas::MyCanvas(wxWindow* parent, bool mirror)
wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE) wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)
{ {
m_mirror = mirror; m_mirror = mirror;
SetScrollbars(20, 20, 5, 5);
} }
void MyCanvas::OnDraw(wxDC& dcOrig) void MyCanvas::OnDraw(wxDC& dcOrig)