From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Nov 2012 23:51:58 +0000 (+0000)
Subject: No changes, just make it easier to tweak splitter sample.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5c299305d49c2165e7fee21945e3078b685196c0

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

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
---

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 438d2cb0da..4fa75721c6 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -111,7 +111,7 @@ public:
     void OnUpdateUIInvisible(wxUpdateUIEvent& event);
 
 private:
-    wxScrolledWindow *m_left, *m_right;
+    wxWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;
     wxWindow *m_replacewindow;
@@ -276,12 +276,10 @@ MyFrame::MyFrame()
 #if 1
     m_left = new MyCanvas(m_splitter, true);
     m_left->SetBackgroundColour(*wxRED);
-    m_left->SetScrollbars(20, 20, 5, 5);
     m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
 
     m_right = new MyCanvas(m_splitter, false);
     m_right->SetBackgroundColour(*wxCYAN);
-    m_right->SetScrollbars(20, 20, 5, 5);
 #else // for testing kbd navigation inside the splitter
     m_left = new wxTextCtrl(m_splitter, wxID_ANY, wxT("first 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)
 {
     m_mirror = mirror;
+    SetScrollbars(20, 20, 5, 5);
 }
 
 void MyCanvas::OnDraw(wxDC& dcOrig)