Rebake after bakefile changes.

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

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 8d069c279de7769aaa6fe084bc1afa8cb0641268..7aaf1e43aac1163bdc5d6ec755e8077d49700fe1 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -46,14 +46,17 @@
 // ID for the menu commands
 enum
 {
-    SPLIT_QUIT,
+    SPLIT_QUIT = 1,
     SPLIT_HORIZONTAL,
     SPLIT_VERTICAL,
     SPLIT_UNSPLIT,
     SPLIT_LIVE,
+    SPLIT_BORDER,
+    SPLIT_3DSASH,
     SPLIT_SETPOSITION,
     SPLIT_SETMINSIZE,
-    SPLIT_SETGRAVITY
+    SPLIT_SETGRAVITY,
+    SPLIT_REPLACE
 };
 
 // ----------------------------------------------------------------------------
@@ -74,16 +77,23 @@ class MyFrame: public wxFrame
 {
 public:
     MyFrame();
-    virtual ~MyFrame(){};
+    virtual ~MyFrame();
 
     // Menu commands
     void SplitHorizontal(wxCommandEvent& event);
     void SplitVertical(wxCommandEvent& event);
     void Unsplit(wxCommandEvent& event);
-    void ToggleLive(wxCommandEvent& event);
+    void ToggleFlag(int flag, bool enable);
+    void ToggleLive(wxCommandEvent& event) 
+                  { ToggleFlag(wxSP_LIVE_UPDATE, event.IsChecked()); }
+    void ToggleBorder(wxCommandEvent& event) 
+                  { ToggleFlag(wxSP_BORDER, event.IsChecked()); }
+    void Toggle3DSash(wxCommandEvent& event) 
+                  { ToggleFlag(wxSP_3DSASH, event.IsChecked()); }
     void SetPosition(wxCommandEvent& event);
     void SetMinSize(wxCommandEvent& event);
     void SetGravity(wxCommandEvent& event);
+    void Replace(wxCommandEvent &event);
 
     void Quit(wxCommandEvent& event);
 
@@ -96,6 +106,7 @@ private:
     wxScrolledWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;
+    wxWindow *m_replacewindow;
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(MyFrame)
@@ -145,6 +156,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create and show the main frame
     MyFrame* frame = new MyFrame;
 
@@ -162,9 +176,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(SPLIT_HORIZONTAL, MyFrame::SplitHorizontal)
     EVT_MENU(SPLIT_UNSPLIT, MyFrame::Unsplit)
     EVT_MENU(SPLIT_LIVE, MyFrame::ToggleLive)
+    EVT_MENU(SPLIT_BORDER, MyFrame::ToggleBorder)
+    EVT_MENU(SPLIT_3DSASH, MyFrame::Toggle3DSash)
     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)
 
@@ -199,6 +216,14 @@ MyFrame::MyFrame()
     splitMenu->AppendCheckItem(SPLIT_LIVE,
                                _T("&Live update\tCtrl-L"),
                                _T("Toggle live update mode"));
+    splitMenu->AppendCheckItem(SPLIT_BORDER,
+                               _T("3D &Border"),
+                               _T("Toggle wxSP_BORDER flag"));
+    splitMenu->Check(SPLIT_BORDER, true);
+    splitMenu->AppendCheckItem(SPLIT_3DSASH,
+                               _T("&3D Sash"),
+                               _T("Toggle wxSP_3DSASH flag"));
+    splitMenu->Check(SPLIT_3DSASH, true);
     splitMenu->Append(SPLIT_SETPOSITION,
                       _T("Set splitter &position\tCtrl-P"),
                       _T("Set the splitter position"));
@@ -210,6 +235,11 @@ MyFrame::MyFrame()
                       _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;
@@ -248,6 +278,16 @@ MyFrame::MyFrame()
 #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
@@ -292,22 +332,29 @@ void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
 #endif // wxUSE_STATUSBAR
 }
 
-void MyFrame::ToggleLive(wxCommandEvent& event )
+void MyFrame::ToggleFlag(int flag, bool enable)
 {
     long style = m_splitter->GetWindowStyleFlag();
-    if ( event.IsChecked() )
-        style |= wxSP_LIVE_UPDATE;
+    if ( enable )
+        style |= flag;
     else
-        style &= ~wxSP_LIVE_UPDATE;
+        style &= ~flag;
 
     m_splitter->SetWindowStyleFlag(style);
+
+    // we need to move sash to redraw it
+    int pos = m_splitter->GetSashPosition();
+    m_splitter->SetSashPosition(pos + 1);
+    m_splitter->SetSashPosition(pos);
 }
 
 void MyFrame::SetPosition(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetSashPosition());
+#if wxUSE_TEXTDLG
     str = wxGetTextFromUser(_T("Enter splitter position:"), _T(""), str, this);
+#endif
     if ( str.empty() )
         return;
 
@@ -327,7 +374,9 @@ void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());
+#if wxUSE_TEXTDLG
     str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);
+#endif
     if ( str.empty() )
         return;
 
@@ -342,7 +391,9 @@ void MyFrame::SetGravity(wxCommandEvent& WXUNUSED(event) )
 {
     wxString str;
     str.Printf( wxT("%g"), m_splitter->GetSashGravity());
+#if wxUSE_TEXTDLG
     str = wxGetTextFromUser(_T("Enter sash gravity (0,1):"), _T(""), str, this);
+#endif
     if ( str.empty() )
         return;
 
@@ -354,6 +405,21 @@ void MyFrame::SetGravity(wxCommandEvent& WXUNUSED(event) )
 #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
 
 void MyFrame::UpdateUIHorizontal(wxUpdateUIEvent& event)
@@ -445,7 +511,7 @@ void MyCanvas::OnDraw(wxDC& dcOrig)
     dc.SetPen(*wxBLACK_PEN);
     dc.DrawLine(0, 0, 100, 200);
 
-    dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
     dc.DrawText(_T("Testing"), 50, 50);
 
     dc.SetPen(*wxRED_PEN);