compilation fix for gcc4 (patch 1428840)

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

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 800421eab9045dbfc556088fb3f9feb0aff4cd1e..50a48cdbd0e4a3ac5dcd68df3089dc068eded4f2 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


@@ -37,11 +46,15 @@
 // ID for the menu commands
 enum
 {
 // ID for the menu commands
 enum
 {

-    SPLIT_QUIT,
+    SPLIT_QUIT = 1,

     SPLIT_HORIZONTAL,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,
     SPLIT_HORIZONTAL,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,

-    SPLIT_SETMINSIZE
+    SPLIT_LIVE,
+    SPLIT_SETPOSITION,
+    SPLIT_SETMINSIZE,
+    SPLIT_SETGRAVITY,
+    SPLIT_REPLACE

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -51,7 +64,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 +81,12 @@ 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 SetGravity(wxCommandEvent& event);
+    void Replace(wxCommandEvent &event);
+

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


@@ -76,8 +98,10 @@ private:
     wxScrolledWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;
     wxScrolledWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;

+    wxWindow *m_replacewindow;

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(MyFrame)

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


@@ -89,21 +113,27 @@ public:
     void OnPositionChanged(wxSplitterEvent& event);
     void OnPositionChanging(wxSplitterEvent& event);
     void OnDClick(wxSplitterEvent& event);
     void OnPositionChanged(wxSplitterEvent& event);
     void OnPositionChanging(wxSplitterEvent& event);
     void OnDClick(wxSplitterEvent& event);

-    void OnUnsplit(wxSplitterEvent& event);
+    void OnUnsplitEvent(wxSplitterEvent& event);

 
 private:
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()
 
 private:
     wxFrame *m_frame;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(MySplitterWindow)

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

-    MyCanvas(wxWindow* parent);
-    virtual ~MyCanvas();
+    MyCanvas(wxWindow* parent, bool mirror);
+    virtual ~MyCanvas(){};

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

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

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


@@ -121,9 +151,9 @@ bool MyApp::OnInit()
     // create and show the main frame
     MyFrame* frame = new MyFrame;
 
     // create and show the main frame
     MyFrame* frame = new MyFrame;
 

-    frame->Show(TRUE);
+    frame->Show(true);

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -134,8 +164,13 @@ 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_SETGRAVITY, MyFrame::SetGravity)
+    EVT_MENU(SPLIT_REPLACE, MyFrame::Replace)
+
+    EVT_MENU(SPLIT_QUIT, MyFrame::Quit)

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


@@ -144,107 +179,213 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame()
 
 // My frame constructor
 MyFrame::MyFrame()

-       : wxFrame(NULL, -1, _T("wxSplitterWindow sample"),
+       : wxFrame(NULL, wxID_ANY, _T("wxSplitterWindow sample"),

                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {

+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     // Make a menubar
 
     // 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->Append(SPLIT_SETGRAVITY,
+                      _T("Set &gravity\tCtrl-G"),
+                      _T("Set gravity of sash"));
+    splitMenu->AppendSeparator();
+
+    splitMenu->Append(SPLIT_REPLACE,
+                      _T("&Replace right window"),
+                      _T("Replace right window"));
+    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);
     m_splitter = new MySplitterWindow(this);

+    
+    m_splitter->SetSashGravity(1.0);

 
 #if 1
 
 #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
 #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"));
+    m_left = new wxTextCtrl(m_splitter, wxID_ANY, _T("first text"));
+    m_right = new wxTextCtrl(m_splitter, wxID_ANY, _T("second text"));

 #endif
 
     // you can also do this to start with a single window
 #if 0
 #endif
 
     // you can also do this to start with a single window
 #if 0

-    m_right->Show(FALSE);
+    m_right->Show(false);

     m_splitter->Initialize(m_left);
 #else
     // you can also try -100
     m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 
     m_splitter->Initialize(m_left);
 #else
     // you can also try -100
     m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Min pane size = 0"), 1);
     SetStatusText(_T("Min pane size = 0"), 1);

+#endif // wxUSE_STATUSBAR
+
+    m_replacewindow = (wxWindow *)0;

 }
 
 MyFrame::~MyFrame()
 {
 }
 
 MyFrame::~MyFrame()
 {

+    if (m_replacewindow) {
+        m_replacewindow->Destroy();
+        m_replacewindow = (wxWindow *)0;
+    }

 }
 
 // menu command handlers
 
 void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 // 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();
 }
 
 void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();

-    m_left->Show(TRUE);
-    m_right->Show(TRUE);
+    m_left->Show(true);
+    m_right->Show(true);

     m_splitter->SplitHorizontally( m_left, m_right );
 
     m_splitter->SplitHorizontally( m_left, m_right );
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Splitter split horizontally"), 1);
     SetStatusText(_T("Splitter split horizontally"), 1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 }
 
 void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();

-    m_left->Show(TRUE);
-    m_right->Show(TRUE);
+    m_left->Show(true);
+    m_right->Show(true);

     m_splitter->SplitVertically( m_left, m_right );
 
     m_splitter->SplitVertically( m_left, m_right );
 

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Splitter split vertically"), 1);
     SetStatusText(_T("Splitter split vertically"), 1);

+#endif // wxUSE_STATUSBAR

 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();

+#if wxUSE_STATUSBAR

     SetStatusText(_T("No splitter"));
     SetStatusText(_T("No splitter"));

+#endif // wxUSE_STATUSBAR
+}
+
+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);
+#if wxUSE_STATUSBAR
+    str.Printf( wxT("Min pane size = %d"), minsize);
+    SetStatusText(str, 1);
+#endif // wxUSE_STATUSBAR
+}
+void MyFrame::SetGravity(wxCommandEvent& WXUNUSED(event) )
+{
+    wxString str;
+    str.Printf( wxT("%g"), m_splitter->GetSashGravity());
+    str = wxGetTextFromUser(_T("Enter sash gravity (0,1):"), _T(""), str, this);
+    if ( str.empty() )
+        return;
+
+    double gravity = wxStrtod( str, (wxChar**)NULL);
+    m_splitter->SetSashGravity(gravity);
+#if wxUSE_STATUSBAR
+    str.Printf( wxT("Gravity = %g"), gravity);

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

+#endif // wxUSE_STATUSBAR
+}
+
+void MyFrame::Replace(wxCommandEvent& WXUNUSED(event) )
+{
+    if (m_replacewindow == 0) {
+        m_replacewindow = m_splitter->GetWindow2();
+        m_splitter->ReplaceWindow(m_replacewindow, new wxPanel(m_splitter, wxID_ANY));
+        m_replacewindow->Hide();
+    } else {
+        wxWindow *empty = m_splitter->GetWindow2();
+        m_splitter->ReplaceWindow(empty, m_replacewindow);
+        m_replacewindow->Show();
+        m_replacewindow = 0;
+        empty->Destroy();
+    }

 }
 
 // Update UI handlers
 }
 
 // Update UI handlers


@@ -269,18 +410,19 @@ void MyFrame::UpdateUIUnsplit(wxUpdateUIEvent& event)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow)

-    EVT_SPLITTER_SASH_POS_CHANGED(-1, MySplitterWindow::OnPositionChanged)
-    EVT_SPLITTER_SASH_POS_CHANGING(-1, MySplitterWindow::OnPositionChanging)
+    EVT_SPLITTER_SASH_POS_CHANGED(wxID_ANY, MySplitterWindow::OnPositionChanged)
+    EVT_SPLITTER_SASH_POS_CHANGING(wxID_ANY, MySplitterWindow::OnPositionChanging)

 
 

-    EVT_SPLITTER_DCLICK(-1, MySplitterWindow::OnDClick)
+    EVT_SPLITTER_DCLICK(wxID_ANY, MySplitterWindow::OnDClick)

 
 

-    EVT_SPLITTER_UNSPLIT(-1, MySplitterWindow::OnUnsplit)
+    EVT_SPLITTER_UNSPLIT(wxID_ANY, MySplitterWindow::OnUnsplitEvent)

 END_EVENT_TABLE()
 
 MySplitterWindow::MySplitterWindow(wxFrame *parent)
 END_EVENT_TABLE()
 
 MySplitterWindow::MySplitterWindow(wxFrame *parent)

-                : wxSplitterWindow(parent, -1,
+                : wxSplitterWindow(parent, wxID_ANY,

                                    wxDefaultPosition, wxDefaultSize,
                                    wxDefaultPosition, wxDefaultSize,

-                                   wxSP_3D | wxSP_LIVE_UPDATE | wxCLIP_CHILDREN)
+                                   wxSP_3D | wxSP_LIVE_UPDATE |
+                                   wxCLIP_CHILDREN /* | wxSP_NO_XP_THEME */ )

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


@@ -303,14 +445,18 @@ void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {
 
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {

+#if wxUSE_STATUSBAR

     m_frame->SetStatusText(_T("Splitter double clicked"), 1);
     m_frame->SetStatusText(_T("Splitter double clicked"), 1);

+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
 
     event.Skip();
 }
 

-void MySplitterWindow::OnUnsplit(wxSplitterEvent& event)
+void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)

 {
 {

+#if wxUSE_STATUSBAR

     m_frame->SetStatusText(_T("Splitter unsplit"), 1);
     m_frame->SetStatusText(_T("Splitter unsplit"), 1);

+#endif // wxUSE_STATUSBAR

 
     event.Skip();
 }
 
     event.Skip();
 }


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

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

 {
 {

+    m_mirror = mirror;

 }
 
 }
 

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

 {
 {

-}
+    wxMirrorDC dc(dcOrig, m_mirror);

 
 

-void MyCanvas::OnDraw(wxDC& dc)
-{

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