From 5c299305d49c2165e7fee21945e3078b685196c0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Nov 2012 23:51:58 +0000 Subject: [PATCH] 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 --- samples/splitter/splitter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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) -- 2.45.2