added the splitter event processing and also cleaned up the sample a bit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/splitter/splitter.cpp

@@ -9,6 +9,14 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -22,9 +30,23 @@
 
 #include "wx/splitter.h"
 
-class MyApp;
+// ----------------------------------------------------------------------------
-class MyFrame;
+// constants
-class MyCanvas;
+// ----------------------------------------------------------------------------
+
+// ID for the menu commands
+enum
+{
+    SPLIT_QUIT,
+    SPLIT_HORIZONTAL,
+    SPLIT_VERTICAL,
+    SPLIT_UNSPLIT,
+    SPLIT_SETMINSIZE
+};
+
+// ----------------------------------------------------------------------------
+// our classes
+// ----------------------------------------------------------------------------
 
 class MyApp: public wxApp
 {
@@ -32,36 +54,10 @@ public:
     bool OnInit();
 };
 
-class MySplitterWindow : public wxSplitterWindow
-{
-public:
-  MySplitterWindow(wxFrame *parent, wxWindowID id)
-    : wxSplitterWindow(parent, id, wxDefaultPosition, wxDefaultSize,
-                       wxSP_3D | wxSP_LIVE_UPDATE | wxCLIP_CHILDREN)
-  {
-    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;
-};
-
 class MyFrame: public wxFrame
 {
 public:
-  MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame();
     virtual ~MyFrame();
 
     // Menu commands
@@ -77,11 +73,26 @@ public:
     void UpdateUIUnsplit(wxUpdateUIEvent& event);
 
 private:
-  void UpdatePosition();
-
     wxScrolledWindow *m_left, *m_right;
 
-  MySplitterWindow* m_splitter;
+    wxSplitterWindow* m_splitter;
+
+    DECLARE_EVENT_TABLE()
+};
+
+class MySplitterWindow : public wxSplitterWindow
+{
+public:
+    MySplitterWindow(wxFrame *parent);
+
+    // event handlers
+    void OnPositionChanged(wxSplitterEvent& event);
+    void OnPositionChanging(wxSplitterEvent& event);
+    void OnDClick(wxSplitterEvent& event);
+    void OnUnsplit(wxSplitterEvent& event);
+
+private:
+    wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()
 };
@@ -89,48 +100,36 @@ private:
 class MyCanvas: public wxScrolledWindow
 {
 public:
-    MyCanvas(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxString& name = "");
+    MyCanvas(wxWindow* parent);
     virtual ~MyCanvas();
 
     virtual void OnDraw(wxDC& dc);
-
-DECLARE_EVENT_TABLE()
 };
 
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+// ============================================================================
-END_EVENT_TABLE()
+// implementation
+// ============================================================================
 
-// ID for the menu commands
+// ----------------------------------------------------------------------------
-enum
+// MyApp
-{
+// ----------------------------------------------------------------------------
-  SPLIT_QUIT,
-  SPLIT_HORIZONTAL,
-  SPLIT_VERTICAL,
-  SPLIT_UNSPLIT,
-  SPLIT_SETMINSIZE
-};
-
-// Window ids
-#define SPLITTER_WINDOW     100
-#define SPLITTER_FRAME      101
-#define CANVAS1             102
-#define CANVAS2             103
 
 IMPLEMENT_APP(MyApp)
 
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
-  MyFrame* frame = new MyFrame((wxFrame *) NULL, "wxSplitterWindow Example",
+    // create and show the main frame
-                               wxPoint(50, 50), wxSize(420, 300));
+    MyFrame* frame = new MyFrame;
 
-  // Show the frame
     frame->Show(TRUE);
 
-  SetTopWindow(frame);
-
     return TRUE;
 }
 
+// ----------------------------------------------------------------------------
+// MyFrame
+// ----------------------------------------------------------------------------
+
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(SPLIT_VERTICAL, MyFrame::SplitVertical)
     EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
@@ -144,42 +143,42 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 // My frame constructor
-MyFrame::MyFrame(wxFrame* frame, const wxString& title,
+MyFrame::MyFrame()
-                 const wxPoint& pos, const wxSize& size)
+       : wxFrame(NULL, -1, _T("wxSplitterWindow sample"),
-       : wxFrame(frame, SPLITTER_FRAME, title, pos, size,
+                 wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     CreateStatusBar(2);
 
     // Make a menubar
     wxMenu *fileMenu = new wxMenu;
-  fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically\tCtrl-V", "Split vertically");
+    fileMenu->Append(SPLIT_VERTICAL, _T("Split &Vertically\tCtrl-V"), _T("Split vertically"));
-  fileMenu->Append(SPLIT_HORIZONTAL, "Split &Horizontally\tCtrl-H", "Split horizontally");
+    fileMenu->Append(SPLIT_HORIZONTAL, _T("Split &Horizontally\tCtrl-H"), _T("Split horizontally"));
-  fileMenu->Append(SPLIT_UNSPLIT, "&Unsplit\tCtrl-U", "Unsplit");
+    fileMenu->Append(SPLIT_UNSPLIT, _T("&Unsplit\tCtrl-U"), _T("Unsplit"));
     fileMenu->AppendSeparator();
-  fileMenu->Append(SPLIT_SETMINSIZE, "Set &min size", "Set minimum pane size");
+    fileMenu->Append(SPLIT_SETMINSIZE, _T("Set &min size"), _T("Set minimum pane size"));
     fileMenu->AppendSeparator();
-  fileMenu->Append(SPLIT_QUIT, "E&xit\tAlt-X", "Exit");
+    fileMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));
 
     wxMenuBar *menuBar = new wxMenuBar;
-  menuBar->Append(fileMenu, "&File");
+    menuBar->Append(fileMenu, _T("&File"));
 
     SetMenuBar(menuBar);
 
-  m_splitter = new MySplitterWindow(this, SPLITTER_WINDOW);
+    m_splitter = new MySplitterWindow(this);
 
 #if 1
-  m_left = new MyCanvas(m_splitter, CANVAS1, wxPoint(0, 0), wxSize(400, 400), "Test1" );
+    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, CANVAS2, wxPoint(0, 0), wxSize(400, 400), "Test2" );
+    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, "first text");
+    m_left = new wxTextCtrl(m_splitter, -1, _T("first text"));
-  m_right = new wxTextCtrl(m_splitter, -1, "second text");
+    m_right = new wxTextCtrl(m_splitter, -1, _T("second text"));
 #endif
 
     // you can also do this to start with a single window
@@ -190,13 +189,15 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title,
     m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 
-  SetStatusText("Min pane size = 0", 1);
+    SetStatusText(_T("Min pane size = 0"), 1);
 }
 
 MyFrame::~MyFrame()
 {
 }
 
+// menu command handlers
+
 void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
 {
     Close(TRUE);
@@ -209,7 +210,6 @@ void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
     m_left->Show(TRUE);
     m_right->Show(TRUE);
     m_splitter->SplitHorizontally( m_left, m_right );
-  UpdatePosition();
 }
 
 void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
@@ -219,35 +219,34 @@ void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
     m_left->Show(TRUE);
     m_right->Show(TRUE);
     m_splitter->SplitVertically( m_left, m_right );
-  UpdatePosition();
 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
-  SetStatusText("No splitter");
+    SetStatusText(_T("No splitter"));
 }
 
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
-  str.Printf( _T("%d"), m_splitter->GetMinimumPaneSize());
+    str.Printf( _T(_T("%d")), m_splitter->GetMinimumPaneSize());
-  str = wxGetTextFromUser("Enter minimal size for panes:", "", str, this);
+    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("Min pane size = %d"), minsize);
+    str.Printf( _T(_T("Min pane size = %d")), minsize);
     SetStatusText(str, 1);
 }
 
+// Update UI handlers
+
 void MyFrame::UpdateUIHorizontal(wxUpdateUIEvent& event)
 {
-    bool foo = ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) );
+    event.Enable( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) );
-    if( !foo )
-  event.Enable( foo );
 }
 
 void MyFrame::UpdateUIVertical(wxUpdateUIEvent& event)
@@ -260,15 +259,63 @@ void MyFrame::UpdateUIUnsplit(wxUpdateUIEvent& event)
     event.Enable( m_splitter->IsSplit() );
 }
 
-void MyFrame::UpdatePosition()
+// ----------------------------------------------------------------------------
+// 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)
 {
-  wxString str;
+    m_frame = parent;
-  str.Printf( _("Sash position = %d"), m_splitter->GetSashPosition());
-  SetStatusText(str);
 }
 
-MyCanvas::MyCanvas(wxWindow* parent, wxWindowID id, const wxPoint& point, const wxSize& size, const wxString &name ) :
+void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
-    wxScrolledWindow(parent, id, point, size, 0, name )
+{
+    wxLogStatus(m_frame, _T("Position has changed, now = %d (or %d)"),
+                event.GetSashPosition(), GetSashPosition());
+
+    event.Skip();
+}
+
+void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
+{
+    wxLogStatus(m_frame, _T("Position is changing, now = %d (or %d)"),
+                event.GetSashPosition(), GetSashPosition());
+
+    event.Skip();
+}
+
+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)
 {
 }
 
@@ -282,9 +329,10 @@ void MyCanvas::OnDraw(wxDC& dc)
     dc.DrawLine(0, 0, 100, 100);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
-  dc.DrawText("Testing", 50, 50);
+    dc.DrawText(_T("Testing"), 50, 50);
 
     dc.SetPen(*wxRED_PEN);
     dc.SetBrush(*wxGREEN_BRUSH);
     dc.DrawRectangle(120, 120, 100, 80);
 }
+