Applied patch [ 892511 ] wxUniversal: fix of segfault in toolbar.cpp

[wxWidgets.git] / samples / splitter / splitter.cpp

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 800421eab9045dbfc556088fb3f9feb0aff4cd1e..c869422b91e4f4e2650b9fdc41d0138fa5fa2fee 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -25,10 +25,19 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/log.h"
+
+    #include "wx/app.h"
+    #include "wx/frame.h"
+
+    #include "wx/scrolwin.h"
+    #include "wx/menu.h"
+
+    #include "wx/textdlg.h"       // for wxGetTextFromUser

 #endif
 
 #include "wx/splitter.h"
 #endif
 
 #include "wx/splitter.h"

+#include "wx/dcmirror.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -41,6 +50,8 @@ enum
     SPLIT_HORIZONTAL,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,
     SPLIT_HORIZONTAL,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,

+    SPLIT_LIVE,
+    SPLIT_SETPOSITION,

     SPLIT_SETMINSIZE
 };
 
     SPLIT_SETMINSIZE
 };
 


@@ -51,7 +62,11 @@ enum
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

-    bool OnInit();
+    MyApp() { }
+
+    virtual bool OnInit();
+
+    DECLARE_NO_COPY_CLASS(MyApp)

 };
 
 class MyFrame: public wxFrame
 };
 
 class MyFrame: public wxFrame


@@ -64,7 +79,10 @@ public:
     void SplitHorizontal(wxCommandEvent& event);
     void SplitVertical(wxCommandEvent& event);
     void Unsplit(wxCommandEvent& event);
     void SplitHorizontal(wxCommandEvent& event);
     void SplitVertical(wxCommandEvent& event);
     void Unsplit(wxCommandEvent& event);

+    void ToggleLive(wxCommandEvent& event);
+    void SetPosition(wxCommandEvent& event);

     void SetMinSize(wxCommandEvent& event);
     void SetMinSize(wxCommandEvent& event);

+

     void Quit(wxCommandEvent& event);
 
     // Menu command update functions
     void Quit(wxCommandEvent& event);
 
     // Menu command update functions


@@ -78,6 +96,7 @@ private:
     wxSplitterWindow* m_splitter;
 
     DECLARE_EVENT_TABLE()
     wxSplitterWindow* m_splitter;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(MyFrame)

 };
 
 class MySplitterWindow : public wxSplitterWindow
 };
 
 class MySplitterWindow : public wxSplitterWindow


@@ -95,15 +114,21 @@ private:
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(MySplitterWindow)

 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas(wxWindow* parent);
+    MyCanvas(wxWindow* parent, bool mirror);

     virtual ~MyCanvas();
 
     virtual void OnDraw(wxDC& dc);
     virtual ~MyCanvas();
 
     virtual void OnDraw(wxDC& dc);

+
+private:
+    bool m_mirror;
+
+    DECLARE_NO_COPY_CLASS(MyCanvas)

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -134,9 +159,12 @@ 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_VERTICAL, MyFrame::SplitVertical)
     EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
     EVT_MENU(SPLIT_UNSPLIT, MyFrame::Unsplit)

-    EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
+    EVT_MENU(SPLIT_LIVE, MyFrame::ToggleLive)
+    EVT_MENU(SPLIT_SETPOSITION, MyFrame::SetPosition)

     EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
 
     EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
 

+    EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
+

     EVT_UPDATE_UI(SPLIT_VERTICAL, MyFrame::UpdateUIVertical)
     EVT_UPDATE_UI(SPLIT_HORIZONTAL, MyFrame::UpdateUIHorizontal)
     EVT_UPDATE_UI(SPLIT_UNSPLIT, MyFrame::UpdateUIUnsplit)
     EVT_UPDATE_UI(SPLIT_VERTICAL, MyFrame::UpdateUIVertical)
     EVT_UPDATE_UI(SPLIT_HORIZONTAL, MyFrame::UpdateUIHorizontal)
     EVT_UPDATE_UI(SPLIT_UNSPLIT, MyFrame::UpdateUIUnsplit)


@@ -151,31 +179,48 @@ MyFrame::MyFrame()
     CreateStatusBar(2);
 
     // Make a menubar
     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"));
+    wxMenu *splitMenu = new wxMenu;
+    splitMenu->Append(SPLIT_VERTICAL,
+                      _T("Split &Vertically\tCtrl-V"),
+                      _T("Split vertically"));
+    splitMenu->Append(SPLIT_HORIZONTAL,
+                      _T("Split &Horizontally\tCtrl-H"),
+                      _T("Split horizontally"));
+    splitMenu->Append(SPLIT_UNSPLIT,
+                      _T("&Unsplit\tCtrl-U"),
+                      _T("Unsplit"));
+    splitMenu->AppendSeparator();
+
+    splitMenu->AppendCheckItem(SPLIT_LIVE,
+                               _T("&Live update\tCtrl-L"),
+                               _T("Toggle live update mode"));
+    splitMenu->Append(SPLIT_SETPOSITION,
+                      _T("Set splitter &position\tCtrl-P"),
+                      _T("Set the splitter position"));
+    splitMenu->Append(SPLIT_SETMINSIZE,
+                      _T("Set &min size\tCtrl-M"),
+                      _T("Set minimum pane size"));
+    splitMenu->AppendSeparator();
+
+    splitMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));

 
     wxMenuBar *menuBar = new wxMenuBar;
 
     wxMenuBar *menuBar = new wxMenuBar;

-    menuBar->Append(fileMenu, _T("&File"));
+    menuBar->Append(splitMenu, _T("&Splitter"));

 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 

+    menuBar->Check(SPLIT_LIVE, TRUE);

     m_splitter = new MySplitterWindow(this);
 
 #if 1
     m_splitter = new MySplitterWindow(this);
 
 #if 1

-    m_left = new MyCanvas(m_splitter);
+    m_left = new MyCanvas(m_splitter, true);

     m_left->SetBackgroundColour(*wxRED);
     m_left->SetBackgroundColour(*wxRED);

-    m_left->SetScrollbars(20, 20, 50, 50);
+    m_left->SetScrollbars(20, 20, 5, 5);

     m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
 
     m_left->SetCursor(wxCursor(wxCURSOR_MAGNIFIER));
 

-    m_right = new MyCanvas(m_splitter);
+    m_right = new MyCanvas(m_splitter, false);

     m_right->SetBackgroundColour(*wxCYAN);
     m_right->SetBackgroundColour(*wxCYAN);

-    m_right->SetScrollbars(20, 20, 50, 50);
+    m_right->SetScrollbars(20, 20, 5, 5);

 #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"));
 #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"));


@@ -233,17 +278,48 @@ void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
     SetStatusText(_T("No splitter"));
 }
 
     SetStatusText(_T("No splitter"));
 }
 

+void MyFrame::ToggleLive(wxCommandEvent& event )
+{
+    long style = m_splitter->GetWindowStyleFlag();
+    if ( event.IsChecked() )
+        style |= wxSP_LIVE_UPDATE;
+    else
+        style &= ~wxSP_LIVE_UPDATE;
+
+    m_splitter->SetWindowStyleFlag(style);
+}
+
+void MyFrame::SetPosition(wxCommandEvent& WXUNUSED(event) )
+{
+    wxString str;
+    str.Printf( wxT("%d"), m_splitter->GetSashPosition());
+    str = wxGetTextFromUser(_T("Enter splitter position:"), _T(""), str, this);
+    if ( str.empty() )
+        return;
+
+    long pos;
+    if ( !str.ToLong(&pos) )
+    {
+        wxLogError(_T("The splitter position should be an integer."));
+        return;
+    }
+
+    m_splitter->SetSashPosition(pos);
+
+    wxLogStatus(this, _T("Splitter position set to %ld"), pos);
+}
+

 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
 void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;

-    str.Printf( _T(_T("%d")), m_splitter->GetMinimumPaneSize());
+    str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());

     str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);
     str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);

-    if ( str.IsEmpty() )
+    if ( str.empty() )

         return;
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);
         return;
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);

-    str.Printf( _T(_T("Min pane size = %d")), minsize);
+    str.Printf( wxT("Min pane size = %d"), minsize);

     SetStatusText(str, 1);
 }
 
     SetStatusText(str, 1);
 }
 


@@ -280,7 +356,7 @@ END_EVENT_TABLE()
 MySplitterWindow::MySplitterWindow(wxFrame *parent)
                 : wxSplitterWindow(parent, -1,
                                    wxDefaultPosition, wxDefaultSize,
 MySplitterWindow::MySplitterWindow(wxFrame *parent)
                 : wxSplitterWindow(parent, -1,
                                    wxDefaultPosition, wxDefaultSize,

-                                   wxSP_3D | wxSP_LIVE_UPDATE | wxCLIP_CHILDREN)
+                                   0x700| wxSP_LIVE_UPDATE | wxCLIP_CHILDREN)

 {
     m_frame = parent;
 }
 {
     m_frame = parent;
 }


@@ -319,19 +395,23 @@ void MySplitterWindow::OnUnsplit(wxSplitterEvent& event)
 // MyCanvas
 // ----------------------------------------------------------------------------
 
 // MyCanvas
 // ----------------------------------------------------------------------------
 

-MyCanvas::MyCanvas(wxWindow* parent)
-        : wxScrolledWindow(parent, -1)
+MyCanvas::MyCanvas(wxWindow* parent, bool mirror)
+        : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+                           wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)

 {
 {

+    m_mirror = mirror;

 }
 
 MyCanvas::~MyCanvas()
 {
 }
 
 }
 
 MyCanvas::~MyCanvas()
 {
 }
 

-void MyCanvas::OnDraw(wxDC& dc)
+void MyCanvas::OnDraw(wxDC& dcOrig)

 {
 {

+    wxMirrorDC dc(dcOrig, m_mirror);
+

     dc.SetPen(*wxBLACK_PEN);
     dc.SetPen(*wxBLACK_PEN);

-    dc.DrawLine(0, 0, 100, 100);
+    dc.DrawLine(0, 0, 100, 200);

 
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText(_T("Testing"), 50, 50);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText(_T("Testing"), 50, 50);