Minor changes, just trim trailing spaces in webview code.

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

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index c869422b91e4f4e2650b9fdc41d0138fa5fa2fee..438d2cb0da9fbb3730b3e2eb9b9edf648a831c3e 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -39,6 +39,10 @@
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 

+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif
+

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


@@ -46,13 +50,18 @@
 // ID for the menu commands
 enum
 {
 // ID for the menu commands
 enum
 {

-    SPLIT_QUIT,
+    SPLIT_QUIT = 1,

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

+    SPLIT_BORDER,
+    SPLIT_3DSASH,

     SPLIT_SETPOSITION,
     SPLIT_SETPOSITION,

-    SPLIT_SETMINSIZE
+    SPLIT_SETMINSIZE,
+    SPLIT_SETGRAVITY,
+    SPLIT_REPLACE,
+    SPLIT_INVISIBLE

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


@@ -66,7 +75,7 @@ public:
 
     virtual bool OnInit();
 
 
     virtual bool OnInit();
 

-    DECLARE_NO_COPY_CLASS(MyApp)
+    wxDECLARE_NO_COPY_CLASS(MyApp);

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


@@ -75,28 +84,40 @@ public:
     MyFrame();
     virtual ~MyFrame();
 
     MyFrame();
     virtual ~MyFrame();
 

-    // Menu commands
-    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 ToggleFlag(int flag, bool enable);

 
 

-    void Quit(wxCommandEvent& event);
+    // Menu commands
+    void OnSplitHorizontal(wxCommandEvent& event);
+    void OnSplitVertical(wxCommandEvent& event);
+    void OnUnsplit(wxCommandEvent& event);
+    void OnToggleLive(wxCommandEvent& event)
+                  { ToggleFlag(wxSP_LIVE_UPDATE, event.IsChecked()); }
+    void OnToggleBorder(wxCommandEvent& event)
+                  { ToggleFlag(wxSP_BORDER, event.IsChecked()); }
+    void OnToggle3DSash(wxCommandEvent& event)
+                  { ToggleFlag(wxSP_3DSASH, event.IsChecked()); }
+    void OnSetPosition(wxCommandEvent& event);
+    void OnSetMinSize(wxCommandEvent& event);
+    void OnSetGravity(wxCommandEvent& event);
+    void OnReplace(wxCommandEvent &event);
+    void OnToggleInvisible(wxCommandEvent &event);
+
+    void OnQuit(wxCommandEvent& event);

 
     // Menu command update functions
 
     // Menu command update functions

-    void UpdateUIHorizontal(wxUpdateUIEvent& event);
-    void UpdateUIVertical(wxUpdateUIEvent& event);
-    void UpdateUIUnsplit(wxUpdateUIEvent& event);
+    void OnUpdateUIHorizontal(wxUpdateUIEvent& event);
+    void OnUpdateUIVertical(wxUpdateUIEvent& event);
+    void OnUpdateUIUnsplit(wxUpdateUIEvent& event);
+    void OnUpdateUIInvisible(wxUpdateUIEvent& event);

 
 private:
     wxScrolledWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;
 
 private:
     wxScrolledWindow *m_left, *m_right;
 
     wxSplitterWindow* m_splitter;

+    wxWindow *m_replacewindow;

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(MyFrame)
+    wxDECLARE_NO_COPY_CLASS(MyFrame);

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


@@ -108,27 +129,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)
+    wxDECLARE_NO_COPY_CLASS(MySplitterWindow);

 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent, bool mirror);
 };
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent, bool mirror);

-    virtual ~MyCanvas();
+    virtual ~MyCanvas(){};

 
     virtual void OnDraw(wxDC& dc);
 
 private:
     bool m_mirror;
 
 
     virtual void OnDraw(wxDC& dc);
 
 private:
     bool m_mirror;
 

-    DECLARE_NO_COPY_CLASS(MyCanvas)
+    wxDECLARE_NO_COPY_CLASS(MyCanvas);

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


@@ -143,12 +164,15 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

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

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


@@ -156,62 +180,99 @@ bool MyApp::OnInit()
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 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_LIVE, MyFrame::ToggleLive)
-    EVT_MENU(SPLIT_SETPOSITION, MyFrame::SetPosition)
-    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_MENU(SPLIT_VERTICAL, MyFrame::OnSplitVertical)
+    EVT_MENU(SPLIT_HORIZONTAL, MyFrame::OnSplitHorizontal)
+    EVT_MENU(SPLIT_UNSPLIT, MyFrame::OnUnsplit)
+    EVT_MENU(SPLIT_LIVE, MyFrame::OnToggleLive)
+    EVT_MENU(SPLIT_BORDER, MyFrame::OnToggleBorder)
+    EVT_MENU(SPLIT_3DSASH, MyFrame::OnToggle3DSash)
+    EVT_MENU(SPLIT_SETPOSITION, MyFrame::OnSetPosition)
+    EVT_MENU(SPLIT_SETMINSIZE, MyFrame::OnSetMinSize)
+    EVT_MENU(SPLIT_SETGRAVITY, MyFrame::OnSetGravity)
+    EVT_MENU(SPLIT_REPLACE, MyFrame::OnReplace)
+    EVT_MENU(SPLIT_INVISIBLE, MyFrame::OnToggleInvisible)
+
+    EVT_MENU(SPLIT_QUIT, MyFrame::OnQuit)
+
+    EVT_UPDATE_UI(SPLIT_VERTICAL, MyFrame::OnUpdateUIVertical)
+    EVT_UPDATE_UI(SPLIT_HORIZONTAL, MyFrame::OnUpdateUIHorizontal)
+    EVT_UPDATE_UI(SPLIT_UNSPLIT, MyFrame::OnUpdateUIUnsplit)
+    EVT_UPDATE_UI(SPLIT_INVISIBLE, MyFrame::OnUpdateUIInvisible)

 END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame()

-       : wxFrame(NULL, -1, _T("wxSplitterWindow sample"),
+       : wxFrame(NULL, wxID_ANY, wxT("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)
 {

+    SetIcon(wxICON(sample));
+
+#if wxUSE_STATUSBAR

     CreateStatusBar(2);
     CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;
     splitMenu->Append(SPLIT_VERTICAL,
 
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;
     splitMenu->Append(SPLIT_VERTICAL,

-                      _T("Split &Vertically\tCtrl-V"),
-                      _T("Split vertically"));
+                      wxT("Split &Vertically\tCtrl-V"),
+                      wxT("Split vertically"));

     splitMenu->Append(SPLIT_HORIZONTAL,
     splitMenu->Append(SPLIT_HORIZONTAL,

-                      _T("Split &Horizontally\tCtrl-H"),
-                      _T("Split horizontally"));
+                      wxT("Split &Horizontally\tCtrl-H"),
+                      wxT("Split horizontally"));

     splitMenu->Append(SPLIT_UNSPLIT,
     splitMenu->Append(SPLIT_UNSPLIT,

-                      _T("&Unsplit\tCtrl-U"),
-                      _T("Unsplit"));
+                      wxT("&Unsplit\tCtrl-U"),
+                      wxT("Unsplit"));
+    splitMenu->AppendCheckItem(SPLIT_INVISIBLE,
+                      wxT("Toggle sash &invisibility\tCtrl-I"),
+                      wxT("Toggle sash invisibility"));

     splitMenu->AppendSeparator();
 
     splitMenu->AppendCheckItem(SPLIT_LIVE,
     splitMenu->AppendSeparator();
 
     splitMenu->AppendCheckItem(SPLIT_LIVE,

-                               _T("&Live update\tCtrl-L"),
-                               _T("Toggle live update mode"));
+                               wxT("&Live update\tCtrl-L"),
+                               wxT("Toggle live update mode"));
+    splitMenu->AppendCheckItem(SPLIT_BORDER,
+                               wxT("3D &Border"),
+                               wxT("Toggle wxSP_BORDER flag"));
+    splitMenu->Check(SPLIT_BORDER, true);
+    splitMenu->AppendCheckItem(SPLIT_3DSASH,
+                               wxT("&3D Sash"),
+                               wxT("Toggle wxSP_3DSASH flag"));
+    splitMenu->Check(SPLIT_3DSASH, true);

     splitMenu->Append(SPLIT_SETPOSITION,
     splitMenu->Append(SPLIT_SETPOSITION,

-                      _T("Set splitter &position\tCtrl-P"),
-                      _T("Set the splitter position"));
+                      wxT("Set splitter &position\tCtrl-P"),
+                      wxT("Set the splitter position"));

     splitMenu->Append(SPLIT_SETMINSIZE,
     splitMenu->Append(SPLIT_SETMINSIZE,

-                      _T("Set &min size\tCtrl-M"),
-                      _T("Set minimum pane size"));
+                      wxT("Set &min size\tCtrl-M"),
+                      wxT("Set minimum pane size"));
+    splitMenu->Append(SPLIT_SETGRAVITY,
+                      wxT("Set &gravity\tCtrl-G"),
+                      wxT("Set gravity of sash"));
+    splitMenu->AppendSeparator();
+
+    splitMenu->Append(SPLIT_REPLACE,
+                      wxT("&Replace right window"),
+                      wxT("Replace right window"));

     splitMenu->AppendSeparator();
 
     splitMenu->AppendSeparator();
 

-    splitMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));
+    splitMenu->Append(SPLIT_QUIT, wxT("E&xit\tAlt-X"), wxT("Exit"));

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

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

 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 

-    menuBar->Check(SPLIT_LIVE, TRUE);
+    menuBar->Check(SPLIT_LIVE, true);

     m_splitter = new MySplitterWindow(this);
 
     m_splitter = new MySplitterWindow(this);
 

+    // If you use non-zero gravity you must initialize the splitter with its
+    // correct initial size, otherwise it will change the sash position by a
+    // huge amount when it's resized from its initial default size to its real
+    // size when the frame lays it out. This wouldn't be necessary if default
+    // zero gravity were used (although it would do no harm neither).
+    m_splitter->SetSize(GetClientSize());
+    m_splitter->SetSashGravity(1.0);
+

 #if 1
     m_left = new MyCanvas(m_splitter, true);
     m_left->SetBackgroundColour(*wxRED);
 #if 1
     m_left = new MyCanvas(m_splitter, true);
     m_left->SetBackgroundColour(*wxRED);


@@ -222,148 +283,220 @@ MyFrame::MyFrame()
     m_right->SetBackgroundColour(*wxCYAN);
     m_right->SetScrollbars(20, 20, 5, 5);
 #else // for testing kbd navigation inside the splitter
     m_right->SetBackgroundColour(*wxCYAN);
     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"));
+    m_left = new wxTextCtrl(m_splitter, wxID_ANY, wxT("first text"));
+    m_right = new wxTextCtrl(m_splitter, wxID_ANY, wxT("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
 

-    SetStatusText(_T("Min pane size = 0"), 1);
+#if wxUSE_STATUSBAR
+    SetStatusText(wxT("Min pane size = 0"), 1);
+#endif // wxUSE_STATUSBAR
+
+    m_replacewindow = NULL;

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

+    if (m_replacewindow) {
+        m_replacewindow->Destroy();
+    }

 }
 
 // menu command handlers
 
 }
 
 // menu command handlers
 

-void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )

 {
 {

-    Close(TRUE);
+    Close(true);

 }
 
 }
 

-void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnSplitHorizontal(wxCommandEvent& WXUNUSED(event) )

 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 {
     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 );

+    m_replacewindow = NULL;

 
 

-    SetStatusText(_T("Splitter split horizontally"), 1);
+#if wxUSE_STATUSBAR
+    SetStatusText(wxT("Splitter split horizontally"), 1);
+#endif // wxUSE_STATUSBAR

 }
 
 }
 

-void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnSplitVertical(wxCommandEvent& WXUNUSED(event) )

 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 {
     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 );

+    m_replacewindow = NULL;

 
 

-    SetStatusText(_T("Splitter split vertically"), 1);
+#if wxUSE_STATUSBAR
+    SetStatusText(wxT("Splitter split vertically"), 1);
+#endif // wxUSE_STATUSBAR

 }
 
 }
 

-void MyFrame::Unsplit(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnUnsplit(wxCommandEvent& WXUNUSED(event) )

 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();

-    SetStatusText(_T("No splitter"));
+#if wxUSE_STATUSBAR
+    SetStatusText(wxT("No splitter"));
+#endif // wxUSE_STATUSBAR

 }
 
 }
 

-void MyFrame::ToggleLive(wxCommandEvent& event )
+void MyFrame::ToggleFlag(int flag, bool enable)

 {
     long style = m_splitter->GetWindowStyleFlag();
 {
     long style = m_splitter->GetWindowStyleFlag();

-    if ( event.IsChecked() )
-        style |= wxSP_LIVE_UPDATE;
+    if ( enable )
+        style |= flag;

     else
     else

-        style &= ~wxSP_LIVE_UPDATE;
+        style &= ~flag;

 
     m_splitter->SetWindowStyleFlag(style);
 
     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) )
+void MyFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event) )

 {
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetSashPosition());
 {
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetSashPosition());

-    str = wxGetTextFromUser(_T("Enter splitter position:"), _T(""), str, this);
+#if wxUSE_TEXTDLG
+    str = wxGetTextFromUser(wxT("Enter splitter position:"), wxT(""), str, this);
+#endif

     if ( str.empty() )
         return;
 
     long pos;
     if ( !str.ToLong(&pos) )
     {
     if ( str.empty() )
         return;
 
     long pos;
     if ( !str.ToLong(&pos) )
     {

-        wxLogError(_T("The splitter position should be an integer."));
+        wxLogError(wxT("The splitter position should be an integer."));

         return;
     }
 
     m_splitter->SetSashPosition(pos);
 
         return;
     }
 
     m_splitter->SetSashPosition(pos);
 

-    wxLogStatus(this, _T("Splitter position set to %ld"), pos);
+    wxLogStatus(this, wxT("Splitter position set to %ld"), pos);

 }
 
 }
 

-void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnSetMinSize(wxCommandEvent& WXUNUSED(event) )

 {
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());
 {
     wxString str;
     str.Printf( wxT("%d"), m_splitter->GetMinimumPaneSize());

-    str = wxGetTextFromUser(_T("Enter minimal size for panes:"), _T(""), str, this);
+#if wxUSE_TEXTDLG
+    str = wxGetTextFromUser(wxT("Enter minimal size for panes:"), wxT(""), str, this);
+#endif

     if ( str.empty() )
         return;
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);
     if ( str.empty() )
         return;
 
     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);
     str.Printf( wxT("Min pane size = %d"), minsize);
     SetStatusText(str, 1);

+#endif // wxUSE_STATUSBAR
+}
+
+void MyFrame::OnSetGravity(wxCommandEvent& WXUNUSED(event) )
+{
+    wxString str;
+    str.Printf( wxT("%g"), m_splitter->GetSashGravity());
+#if wxUSE_TEXTDLG
+    str = wxGetTextFromUser(wxT("Enter sash gravity (0,1):"), wxT(""), str, this);
+#endif
+    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::OnReplace(wxCommandEvent& WXUNUSED(event) )
+{
+    if (m_replacewindow == NULL) {
+        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();
+        wxASSERT(empty != m_replacewindow);
+        m_splitter->ReplaceWindow(empty, m_replacewindow);
+        m_replacewindow->Show();
+        m_replacewindow = NULL;
+        empty->Destroy();
+    }
+}
+
+void MyFrame::OnToggleInvisible(wxCommandEvent& WXUNUSED(event) )
+{
+    m_splitter->SetSashInvisible(!m_splitter->IsSashInvisible());
+    m_splitter->SizeWindows();

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

-void MyFrame::UpdateUIHorizontal(wxUpdateUIEvent& event)
+void MyFrame::OnUpdateUIHorizontal(wxUpdateUIEvent& event)

 {
     event.Enable( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) );
 }
 
 {
     event.Enable( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_HORIZONTAL) );
 }
 

-void MyFrame::UpdateUIVertical(wxUpdateUIEvent& event)
+void MyFrame::OnUpdateUIVertical(wxUpdateUIEvent& event)

 {
     event.Enable( ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_VERTICAL) ) );
 }
 
 {
     event.Enable( ( (!m_splitter->IsSplit()) || (m_splitter->GetSplitMode() != wxSPLIT_VERTICAL) ) );
 }
 

-void MyFrame::UpdateUIUnsplit(wxUpdateUIEvent& event)
+void MyFrame::OnUpdateUIUnsplit(wxUpdateUIEvent& event)

 {
     event.Enable( m_splitter->IsSplit() );
 }
 
 {
     event.Enable( m_splitter->IsSplit() );
 }
 

+void MyFrame::OnUpdateUIInvisible(wxUpdateUIEvent& event)
+{
+    event.Check( m_splitter->IsSashInvisible() );
+}
+

 // ----------------------------------------------------------------------------
 // MySplitterWindow
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow)
 // ----------------------------------------------------------------------------
 // MySplitterWindow
 // ----------------------------------------------------------------------------
 
 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,

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

 {
     m_frame = parent;
 }
 
 void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
 {
 {
     m_frame = parent;
 }
 
 void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
 {

-    wxLogStatus(m_frame, _T("Position has changed, now = %d (or %d)"),
+    wxLogStatus(m_frame, wxT("Position has changed, now = %d (or %d)"),

                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();
                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();


@@ -371,7 +504,7 @@ void MySplitterWindow::OnPositionChanged(wxSplitterEvent& event)
 
 void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 {
 
 void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event)
 {

-    wxLogStatus(m_frame, _T("Position is changing, now = %d (or %d)"),
+    wxLogStatus(m_frame, wxT("Position is changing, now = %d (or %d)"),

                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();
                 event.GetSashPosition(), GetSashPosition());
 
     event.Skip();


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

-    m_frame->SetStatusText(_T("Splitter double clicked"), 1);
+#if wxUSE_STATUSBAR
+    m_frame->SetStatusText(wxT("Splitter double clicked"), 1);
+#endif // wxUSE_STATUSBAR

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

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

 {
 {

-    m_frame->SetStatusText(_T("Splitter unsplit"), 1);
+#if wxUSE_STATUSBAR
+    m_frame->SetStatusText(wxT("Splitter unsplit"), 1);
+#endif // wxUSE_STATUSBAR

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


@@ -396,16 +533,12 @@ void MySplitterWindow::OnUnsplit(wxSplitterEvent& event)
 // ----------------------------------------------------------------------------
 
 MyCanvas::MyCanvas(wxWindow* parent, bool mirror)
 // ----------------------------------------------------------------------------
 
 MyCanvas::MyCanvas(wxWindow* parent, bool mirror)

-        : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+        : wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,

                            wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     m_mirror = mirror;
 }
 
                            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& dcOrig)
 {
     wxMirrorDC dc(dcOrig, m_mirror);


@@ -413,8 +546,8 @@ void MyCanvas::OnDraw(wxDC& dcOrig)
     dc.SetPen(*wxBLACK_PEN);
     dc.DrawLine(0, 0, 100, 200);
 
     dc.SetPen(*wxBLACK_PEN);
     dc.DrawLine(0, 0, 100, 200);
 

-    dc.SetBackgroundMode(wxTRANSPARENT);
-    dc.DrawText(_T("Testing"), 50, 50);
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc.DrawText(wxT("Testing"), 50, 50);

 
     dc.SetPen(*wxRED_PEN);
     dc.SetBrush(*wxGREEN_BRUSH);
 
     dc.SetPen(*wxRED_PEN);
     dc.SetBrush(*wxGREEN_BRUSH);