X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6718d773ad43f5d7708b14de338131e72f20e99a..30827629fa11f6365f69bd2917e1a35d22c35363:/samples/splitter/splitter.cpp

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 054e799a9c..60fa68fe6e 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -9,255 +9,313 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
+    #include "wx/wx.h"
 #endif
 
 #include "wx/splitter.h"
 
-class MyApp;
-class MyFrame;
-class MyCanvas;
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
 
-class MyApp: public wxApp
+// ID for the menu commands
+enum
 {
-public:
-  bool OnInit();
+    SPLIT_QUIT,
+    SPLIT_HORIZONTAL,
+    SPLIT_VERTICAL,
+    SPLIT_UNSPLIT,
+    SPLIT_SETMINSIZE
 };
 
-class MySplitterWindow : public wxSplitterWindow
+// ----------------------------------------------------------------------------
+// our classes
+// ----------------------------------------------------------------------------
+
+class MyApp: public wxApp
 {
 public:
-  MySplitterWindow(wxFrame *parent, wxWindowID id) 
-    : wxSplitterWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSP_3D | wxSP_LIVE_UPDATE)
-  {
-    m_frame = parent;
-  }
-
-  virtual bool OnSashPositionChange(int newSashPosition)
-  {
-    if ( !wxSplitterWindow::OnSashPositionChange(newSashPosition) )
-      return FALSE;
-    
-    wxString str;
-    str.Printf( _T("Sash position = %d"), newSashPosition);
-    m_frame->SetStatusText(str);
-
-    return TRUE;
-  }
-  
-private:
-  wxFrame *m_frame;
+    bool OnInit();
 };
 
 class MyFrame: public wxFrame
 {
 public:
-  MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size);
-  virtual ~MyFrame();
+    MyFrame();
+    virtual ~MyFrame();
 
-  // Menu commands
-  void SplitHorizontal(wxCommandEvent& event);
-  void SplitVertical(wxCommandEvent& event);
-  void Unsplit(wxCommandEvent& event);
-  void SetMinSize(wxCommandEvent& event);
-  void Quit(wxCommandEvent& event);
+    // Menu commands
+    void SplitHorizontal(wxCommandEvent& event);
+    void SplitVertical(wxCommandEvent& event);
+    void Unsplit(wxCommandEvent& event);
+    void SetMinSize(wxCommandEvent& event);
+    void Quit(wxCommandEvent& event);
 
-  // Menu command update functions
-  void UpdateUIHorizontal(wxUpdateUIEvent& event);
-  void UpdateUIVertical(wxUpdateUIEvent& event);
-  void UpdateUIUnsplit(wxUpdateUIEvent& event);
+    // Menu command update functions
+    void UpdateUIHorizontal(wxUpdateUIEvent& event);
+    void UpdateUIVertical(wxUpdateUIEvent& event);
+    void UpdateUIUnsplit(wxUpdateUIEvent& event);
 
 private:
-  void UpdatePosition();
+    wxScrolledWindow *m_left, *m_right;
 
-  wxMenu*    fileMenu;
-  wxMenuBar*  menuBar;
-  MyCanvas*  m_leftCanvas;
-  MyCanvas*  m_rightCanvas;
-  MySplitterWindow* m_splitter;
+    wxSplitterWindow* m_splitter;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-class MyCanvas: public wxScrolledWindow
+class MySplitterWindow : public wxSplitterWindow
 {
 public:
-	MyCanvas(wxWindow* parent, wxWindowID id, int x, int y, int w, int h, const wxString &name);
-	virtual ~MyCanvas();
+    MySplitterWindow(wxFrame *parent);
 
-  virtual void OnDraw(wxDC& dc);
+    // event handlers
+    void OnPositionChanged(wxSplitterEvent& event);
+    void OnPositionChanging(wxSplitterEvent& event);
+    void OnDClick(wxSplitterEvent& event);
+    void OnUnsplit(wxSplitterEvent& event);
 
-DECLARE_EVENT_TABLE()
-};
+private:
+    wxFrame *m_frame;
 
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-END_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
+};
 
-// ID for the menu commands
-enum
+class MyCanvas: public wxScrolledWindow
 {
-  SPLIT_QUIT,
-  SPLIT_HORIZONTAL,
-  SPLIT_VERTICAL,
-  SPLIT_UNSPLIT,
-  SPLIT_SETMINSIZE
+public:
+    MyCanvas(wxWindow* parent);
+    virtual ~MyCanvas();
+
+    virtual void OnDraw(wxDC& dc);
 };
 
-// Window ids
-#define SPLITTER_WINDOW     100
-#define SPLITTER_FRAME      101
-#define CANVAS1             102
-#define CANVAS2             103
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// MyApp
+// ----------------------------------------------------------------------------
 
 IMPLEMENT_APP(MyApp)
 
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
-  MyFrame* frame = new MyFrame((wxFrame *) NULL, "wxSplitterWindow Example",
-                               wxPoint(50, 50), wxSize(420, 300));
+    // create and show the main frame
+    MyFrame* frame = new MyFrame;
 
-  // Show the frame
-  frame->Show(TRUE);
-  
-  SetTopWindow(frame);
+    frame->Show(TRUE);
 
-  return TRUE;
+    return TRUE;
 }
 
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------
+
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-  EVT_MENU(SPLIT_VERTICAL, MyFrame::SplitVertical)
-  EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
-  EVT_MENU(SPLIT_UNSPLIT, MyFrame::Unsplit)
-  EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
-  EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
-
-  EVT_UPDATE_UI(SPLIT_VERTICAL, MyFrame::UpdateUIVertical)
-  EVT_UPDATE_UI(SPLIT_HORIZONTAL, MyFrame::UpdateUIHorizontal)
-  EVT_UPDATE_UI(SPLIT_UNSPLIT, MyFrame::UpdateUIUnsplit)
+    EVT_MENU(SPLIT_VERTICAL, MyFrame::SplitVertical)
+    EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
+    EVT_MENU(SPLIT_UNSPLIT, MyFrame::Unsplit)
+    EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
+    EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
+
+    EVT_UPDATE_UI(SPLIT_VERTICAL, MyFrame::UpdateUIVertical)
+    EVT_UPDATE_UI(SPLIT_HORIZONTAL, MyFrame::UpdateUIHorizontal)
+    EVT_UPDATE_UI(SPLIT_UNSPLIT, MyFrame::UpdateUIUnsplit)
 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(NULL, -1, _T("wxSplitterWindow sample"),
+                 wxDefaultPosition, wxSize(420, 300),
+                 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
-  CreateStatusBar(2);
-
-  // Make a menubar
-  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");
-  fileMenu->AppendSeparator();
-  fileMenu->Append(SPLIT_SETMINSIZE, "Set &min size", "Set minimum pane size");
-  fileMenu->AppendSeparator();
-  fileMenu->Append(SPLIT_QUIT, "E&xit\tAlt-X", "Exit");
-
-  menuBar = new wxMenuBar;
-  menuBar->Append(fileMenu, "&File");
-
-  SetMenuBar(menuBar);
-
-  m_splitter = new MySplitterWindow(this, SPLITTER_WINDOW);
-  
-  wxSize sz( m_splitter->GetSize() );
-  wxLogMessage( "Initial splitter size: %d %d\n", (int)sz.x, (int)sz.y );
-
-  m_leftCanvas = new MyCanvas(m_splitter, CANVAS1, 0, 0, 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, 0, 0, 400, 400, "Test2" );
-  m_rightCanvas->SetBackgroundColour(*wxCYAN);
-  m_rightCanvas->SetScrollbars(20, 20, 50, 50);
-  m_rightCanvas->Show(FALSE);
-
-  m_splitter->Initialize(m_leftCanvas);
-  SetStatusText("Min pane size = 0", 1);
+    CreateStatusBar(2);
+
+    // Make a menubar
+    wxMenu *fileMenu = new wxMenu;
+    fileMenu->Append(SPLIT_VERTICAL, _T("Split &Vertically\tCtrl-V"), _T("Split vertically"));
+    fileMenu->Append(SPLIT_HORIZONTAL, _T("Split &Horizontally\tCtrl-H"), _T("Split horizontally"));
+    fileMenu->Append(SPLIT_UNSPLIT, _T("&Unsplit\tCtrl-U"), _T("Unsplit"));
+    fileMenu->AppendSeparator();
+    fileMenu->Append(SPLIT_SETMINSIZE, _T("Set &min size"), _T("Set minimum pane size"));
+    fileMenu->AppendSeparator();
+    fileMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));
+
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(fileMenu, _T("&File"));
+
+    SetMenuBar(menuBar);
+
+    m_splitter = new MySplitterWindow(this);
+
+#if 1
+    m_left = new MyCanvas(m_splitter);
+    m_left->SetBackgroundColour(*wxRED);
+    m_left->SetScrollbars(20, 20, 50, 50);
+    m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
+
+    m_right = new MyCanvas(m_splitter);
+    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, _T("first text"));
+    m_right = new wxTextCtrl(m_splitter, -1, _T("second text"));
+#endif
+
+    // you can also do this to start with a single window
+#if 0
+    m_right->Show(FALSE);
+    m_splitter->Initialize(m_left);
+#else
+    m_splitter->SplitVertically(m_left, m_right, 100);
+#endif
+
+    SetStatusText(_T("Min pane size = 0"), 1);
 }
 
 MyFrame::~MyFrame()
 {
 }
 
+// menu command handlers
+
 void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
 {
-  Close(TRUE);
+    Close(TRUE);
 }
 
 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 );
-  UpdatePosition();
+    if ( m_splitter->IsSplit() )
+        m_splitter->Unsplit();
+    m_left->Show(TRUE);
+    m_right->Show(TRUE);
+    m_splitter->SplitHorizontally( m_left, m_right );
 }
 
 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 );
-  UpdatePosition();
+    if ( m_splitter->IsSplit() )
+        m_splitter->Unsplit();
+    m_left->Show(TRUE);
+    m_right->Show(TRUE);
+    m_splitter->SplitVertically( m_left, m_right );
 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
-  if ( m_splitter->IsSplit() )
-    m_splitter->Unsplit();
-  SetStatusText("No splitter");
+    if ( m_splitter->IsSplit() )
+        m_splitter->Unsplit();
+    SetStatusText(_T("No splitter"));
 }
 
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
-  wxString str;
-  str.Printf( _T("%d"), m_splitter->GetMinimumPaneSize());
-  str = wxGetTextFromUser("Enter minimal size for panes:", "", str, this);
-  if ( str.IsEmpty() )
-    return;
-
-  int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
-  m_splitter->SetMinimumPaneSize(minsize);
-  str.Printf( _T("Min pane size = %d"), minsize);
-  SetStatusText(str, 1);
+    wxString str;
+    str.Printf( _T(_T("%d")), m_splitter->GetMinimumPaneSize());
+    str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);
+    if ( str.IsEmpty() )
+        return;
+
+    int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
+    m_splitter->SetMinimumPaneSize(minsize);
+    str.Printf( _T(_T("Min pane size = %d")), minsize);
+    SetStatusText(str, 1);
 }
 
+// Update UI handlers
+
 void MyFrame::UpdateUIHorizontal(wxUpdateUIEvent& event)
 {
-  event.Enable( ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) ) );
+    event.Enable( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) );
 }
 
 void MyFrame::UpdateUIVertical(wxUpdateUIEvent& event)
 {
-  event.Enable( ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_VERTICAL) ) );
+    event.Enable( ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_VERTICAL) ) );
 }
 
 void MyFrame::UpdateUIUnsplit(wxUpdateUIEvent& event)
 {
-  event.Enable( m_splitter->IsSplit() );
+    event.Enable( m_splitter->IsSplit() );
+}
+
+// ----------------------------------------------------------------------------
+// MySplitterWindow
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow)
+    EVT_SPLITTER_SASH_POS_CHANGED(-1, MySplitterWindow::OnPositionChanged)
+    EVT_SPLITTER_SASH_POS_CHANGING(-1, MySplitterWindow::OnPositionChanging)
+
+    EVT_SPLITTER_DCLICK(-1, MySplitterWindow::OnDClick)
+
+    EVT_SPLITTER_UNSPLIT(-1, MySplitterWindow::OnUnsplit)
+END_EVENT_TABLE()
+
+MySplitterWindow::MySplitterWindow(wxFrame *parent)
+                : wxSplitterWindow(parent, -1,
+                                   wxDefaultPosition, wxDefaultSize,
+                                   wxSP_3D | wxSP_LIVE_UPDATE | wxCLIP_CHILDREN)
+{
+    m_frame = parent;
+}
+
+void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
+{
+    wxLogStatus(m_frame, _T("Position has changed, now = %d (or %d)"),
+                event.GetSashPosition(), GetSashPosition());
+
+    event.Skip();
 }
 
-void MyFrame::UpdatePosition()
+void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 {
-  wxString str;
-  str.Printf( _("Sash position = %d"), m_splitter->GetSashPosition());
-  SetStatusText(str);
+    wxLogStatus(m_frame, _T("Position is changing, now = %d (or %d)"),
+                event.GetSashPosition(), GetSashPosition());
+
+    event.Skip();
 }
 
-MyCanvas::MyCanvas(wxWindow* parent, wxWindowID id, int x, int y, int w, int h, const wxString &name ) :
-	wxScrolledWindow(parent, id, wxPoint(x, y), wxSize(w, h), 0, name )
+void MySplitterWindow::OnDClick(wxSplitterEvent& event)
+{
+    m_frame->SetStatusText(_T("Splitter double clicked"), 1);
+
+    event.Skip();
+}
+
+void MySplitterWindow::OnUnsplit(wxSplitterEvent& event)
+{
+    m_frame->SetStatusText(_T("Splitter unsplit"), 1);
+
+    event.Skip();
+}
+
+// ----------------------------------------------------------------------------
+// MyCanvas
+// ----------------------------------------------------------------------------
+
+MyCanvas::MyCanvas(wxWindow* parent)
+        : wxScrolledWindow(parent, -1)
 {
 }
 
@@ -267,13 +325,14 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnDraw(wxDC& dc)
 {
-  dc.SetPen(*wxBLACK_PEN);
-  dc.DrawLine(0, 0, 100, 100);
+    dc.SetPen(*wxBLACK_PEN);
+    dc.DrawLine(0, 0, 100, 100);
 
-  dc.SetBackgroundMode(wxTRANSPARENT);
-  dc.DrawText("Testing", 50, 50);
+    dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.DrawText(_T("Testing"), 50, 50);
 
-  dc.SetPen(*wxRED_PEN);
-  dc.SetBrush(*wxGREEN_BRUSH);
-  dc.DrawRectangle(120, 120, 100, 80);
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush(*wxGREEN_BRUSH);
+    dc.DrawRectangle(120, 120, 100, 80);
 }
+