X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a0b46a7622f28f8365e56b90d62209c63b4ba93..b231914f6abe2c148193b006a0919d60575f9a20:/samples/splitter/splitter.cpp?ds=inline

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 89a7b7c829..2c956b311e 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -36,7 +36,8 @@ class MySplitterWindow : public wxSplitterWindow
 {
 public:
   MySplitterWindow(wxFrame *parent, wxWindowID id)
-    : wxSplitterWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSP_3D | wxSP_LIVE_UPDATE)
+    : wxSplitterWindow(parent, id, wxDefaultPosition, wxDefaultSize,
+                       wxSP_3D | wxSP_LIVE_UPDATE | wxCLIP_CHILDREN)
   {
     m_frame = parent;
   }
@@ -78,13 +79,11 @@ public:
 private:
   void UpdatePosition();
 
-  wxMenu*    fileMenu;
-  wxMenuBar*  menuBar;
-  MyCanvas*  m_leftCanvas;
-  MyCanvas*  m_rightCanvas;
+  wxScrolledWindow *m_left, *m_right;
+
   MySplitterWindow* m_splitter;
 
-DECLARE_EVENT_TABLE()
+  DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
@@ -145,13 +144,15 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 // My frame constructor
-MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size):
-    wxFrame(frame, SPLITTER_FRAME, title, pos, size)
+MyFrame::MyFrame(wxFrame* frame, const wxString& title,
+                 const wxPoint& pos, const wxSize& size)
+       : wxFrame(frame, SPLITTER_FRAME, title, pos, size,
+                 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
   CreateStatusBar(2);
 
   // Make a menubar
-  fileMenu = new wxMenu;
+  wxMenu *fileMenu = new wxMenu;
   fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically\tCtrl-V", "Split vertically");
   fileMenu->Append(SPLIT_HORIZONTAL, "Split &Horizontally\tCtrl-H", "Split horizontally");
   fileMenu->Append(SPLIT_UNSPLIT, "&Unsplit\tCtrl-U", "Unsplit");
@@ -160,33 +161,33 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
   fileMenu->AppendSeparator();
   fileMenu->Append(SPLIT_QUIT, "E&xit\tAlt-X", "Exit");
 
-  menuBar = new wxMenuBar;
+  wxMenuBar *menuBar = new wxMenuBar;
   menuBar->Append(fileMenu, "&File");
 
   SetMenuBar(menuBar);
 
   m_splitter = new MySplitterWindow(this, SPLITTER_WINDOW);
 
-#if 0
-  wxSize sz( m_splitter->GetSize() );
-  wxLogMessage( "Initial splitter size: %d %d\n", (int)sz.x, (int)sz.y );
-#endif // 0
-
-  m_leftCanvas = new MyCanvas(m_splitter, CANVAS1, wxPoint(0, 0), wxSize(400, 400), "Test1" );
-  m_leftCanvas->SetBackgroundColour(*wxRED);
-  m_leftCanvas->SetScrollbars(20, 20, 50, 50);
-  m_leftCanvas->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
-
-  m_rightCanvas = new MyCanvas(m_splitter, CANVAS2, wxPoint(0, 0), wxSize(400, 400), "Test2" );
-  m_rightCanvas->SetBackgroundColour(*wxCYAN);
-  m_rightCanvas->SetScrollbars(20, 20, 50, 50);
+#if 1
+  m_left = new MyCanvas(m_splitter, CANVAS1, wxPoint(0, 0), wxSize(400, 400), "Test1" );
+  m_left->SetBackgroundColour(*wxRED);
+  m_left->SetScrollbars(20, 20, 50, 50);
+  m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
+
+  m_right = new MyCanvas(m_splitter, CANVAS2, wxPoint(0, 0), wxSize(400, 400), "Test2" );
+  m_right->SetBackgroundColour(*wxCYAN);
+  m_right->SetScrollbars(20, 20, 50, 50);
+#else // for testing kbd navigation inside the splitter
+  m_left = new wxTextCtrl(m_splitter, -1, "first text");
+  m_right = new wxTextCtrl(m_splitter, -1, "second text");
+#endif
 
   // you can also do this to start with a single window
 #if 0
-  m_rightCanvas->Show(FALSE);
-  m_splitter->Initialize(m_leftCanvas);
+  m_right->Show(FALSE);
+  m_splitter->Initialize(m_left);
 #else
-  m_splitter->SplitVertically(m_leftCanvas, m_rightCanvas, 100);
+  m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 
   SetStatusText("Min pane size = 0", 1);
@@ -205,9 +206,9 @@ void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
 {
   if ( m_splitter->IsSplit() )
     m_splitter->Unsplit();
-  m_leftCanvas->Show(TRUE);
-  m_rightCanvas->Show(TRUE);
-  m_splitter->SplitHorizontally( m_leftCanvas, m_rightCanvas );
+  m_left->Show(TRUE);
+  m_right->Show(TRUE);
+  m_splitter->SplitHorizontally( m_left, m_right );
   UpdatePosition();
 }
 
@@ -215,9 +216,9 @@ void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
 {
   if ( m_splitter->IsSplit() )
     m_splitter->Unsplit();
-  m_leftCanvas->Show(TRUE);
-  m_rightCanvas->Show(TRUE);
-  m_splitter->SplitVertically( m_leftCanvas, m_rightCanvas );
+  m_left->Show(TRUE);
+  m_right->Show(TRUE);
+  m_splitter->SplitVertically( m_left, m_right );
   UpdatePosition();
 }
 
@@ -244,7 +245,9 @@ void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::UpdateUIHorizontal(wxUpdateUIEvent& event)
 {
-  event.Enable( ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) ) );
+    bool foo = ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) );
+    if( !foo )
+  event.Enable( foo );
 }
 
 void MyFrame::UpdateUIVertical(wxUpdateUIEvent& event)