X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ad18dc32ccf198055de8824c9d78210a1fa8cfe..4f31d61012bfa8371e268e42857f2d47f77c0af6:/samples/splitter/splitter.cpp

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 633e94ea0b..50a48cdbd0 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -46,13 +46,15 @@
 // ID for the menu commands
 enum
 {
-    SPLIT_QUIT,
+    SPLIT_QUIT = 1,
     SPLIT_HORIZONTAL,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,
     SPLIT_LIVE,
     SPLIT_SETPOSITION,
-    SPLIT_SETMINSIZE
+    SPLIT_SETMINSIZE,
+    SPLIT_SETGRAVITY,
+    SPLIT_REPLACE
 };
 
 // ----------------------------------------------------------------------------
@@ -82,6 +84,8 @@ public:
     void ToggleLive(wxCommandEvent& event);
     void SetPosition(wxCommandEvent& event);
     void SetMinSize(wxCommandEvent& event);
+    void SetGravity(wxCommandEvent& event);
+    void Replace(wxCommandEvent &event);
 
     void Quit(wxCommandEvent& event);
 
@@ -94,6 +98,7 @@ private:
     wxScrolledWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;
+    wxWindow *m_replacewindow;
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(MyFrame)
@@ -121,7 +126,7 @@ class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent, bool mirror);
-    virtual ~MyCanvas();
+    virtual ~MyCanvas(){};
 
     virtual void OnDraw(wxDC& dc);
 
@@ -162,6 +167,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(SPLIT_LIVE, MyFrame::ToggleLive)
     EVT_MENU(SPLIT_SETPOSITION, MyFrame::SetPosition)
     EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)
+    EVT_MENU(SPLIT_SETGRAVITY, MyFrame::SetGravity)
+    EVT_MENU(SPLIT_REPLACE, MyFrame::Replace)
 
     EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
 
@@ -176,7 +183,9 @@ MyFrame::MyFrame()
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
+#if wxUSE_STATUSBAR
     CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;
@@ -200,6 +209,14 @@ MyFrame::MyFrame()
     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"));
@@ -211,6 +228,8 @@ MyFrame::MyFrame()
 
     menuBar->Check(SPLIT_LIVE, true);
     m_splitter = new MySplitterWindow(this);
+    
+    m_splitter->SetSashGravity(1.0);
 
 #if 1
     m_left = new MyCanvas(m_splitter, true);
@@ -235,11 +254,19 @@ MyFrame::MyFrame()
     m_splitter->SplitVertically(m_left, m_right, 100);
 #endif
 
+#if wxUSE_STATUSBAR
     SetStatusText(_T("Min pane size = 0"), 1);
+#endif // wxUSE_STATUSBAR
+
+    m_replacewindow = (wxWindow *)0;
 }
 
 MyFrame::~MyFrame()
 {
+    if (m_replacewindow) {
+        m_replacewindow->Destroy();
+        m_replacewindow = (wxWindow *)0;
+    }
 }
 
 // menu command handlers
@@ -257,7 +284,9 @@ void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
     m_right->Show(true);
     m_splitter->SplitHorizontally( m_left, m_right );
 
+#if wxUSE_STATUSBAR
     SetStatusText(_T("Splitter split horizontally"), 1);
+#endif // wxUSE_STATUSBAR
 }
 
 void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
@@ -268,14 +297,18 @@ void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
     m_right->Show(true);
     m_splitter->SplitVertically( m_left, m_right );
 
+#if wxUSE_STATUSBAR
     SetStatusText(_T("Splitter split vertically"), 1);
+#endif // wxUSE_STATUSBAR
 }
 
 void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
+#if wxUSE_STATUSBAR
     SetStatusText(_T("No splitter"));
+#endif // wxUSE_STATUSBAR
 }
 
 void MyFrame::ToggleLive(wxCommandEvent& event )
@@ -319,8 +352,40 @@ void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(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);
+#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
@@ -380,14 +445,18 @@ void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 
 void MySplitterWindow::OnDClick(wxSplitterEvent& event)
 {
+#if wxUSE_STATUSBAR
     m_frame->SetStatusText(_T("Splitter double clicked"), 1);
+#endif // wxUSE_STATUSBAR
 
     event.Skip();
 }
 
 void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 {
+#if wxUSE_STATUSBAR
     m_frame->SetStatusText(_T("Splitter unsplit"), 1);
+#endif // wxUSE_STATUSBAR
 
     event.Skip();
 }
@@ -403,10 +472,6 @@ MyCanvas::MyCanvas(wxWindow* parent, bool mirror)
     m_mirror = mirror;
 }
 
-MyCanvas::~MyCanvas()
-{
-}
-
 void MyCanvas::OnDraw(wxDC& dcOrig)
 {
     wxMirrorDC dc(dcOrig, m_mirror);