use wxUSE_DATEPICKCTRL

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

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index c50441b75f6b3da2947c320f44f79436901637fb..8d069c279de7769aaa6fe084bc1afa8cb0641268 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -52,7 +52,8 @@ enum
     SPLIT_UNSPLIT,
     SPLIT_LIVE,
     SPLIT_SETPOSITION,
     SPLIT_UNSPLIT,
     SPLIT_LIVE,
     SPLIT_SETPOSITION,

-    SPLIT_SETMINSIZE
+    SPLIT_SETMINSIZE,
+    SPLIT_SETGRAVITY

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


@@ -73,7 +74,7 @@ class MyFrame: public wxFrame
 {
 public:
     MyFrame();
 {
 public:
     MyFrame();

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

 
     // Menu commands
     void SplitHorizontal(wxCommandEvent& event);
 
     // Menu commands
     void SplitHorizontal(wxCommandEvent& event);


@@ -82,6 +83,7 @@ public:
     void ToggleLive(wxCommandEvent& event);
     void SetPosition(wxCommandEvent& event);
     void SetMinSize(wxCommandEvent& event);
     void ToggleLive(wxCommandEvent& event);
     void SetPosition(wxCommandEvent& event);
     void SetMinSize(wxCommandEvent& event);

+    void SetGravity(wxCommandEvent& event);

 
     void Quit(wxCommandEvent& event);
 
 
     void Quit(wxCommandEvent& event);
 


@@ -108,7 +110,7 @@ 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;
 
 private:
     wxFrame *m_frame;


@@ -121,7 +123,7 @@ class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent, bool mirror);
 {
 public:
     MyCanvas(wxWindow* parent, bool mirror);

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

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


@@ -146,9 +148,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;

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


@@ -162,6 +164,7 @@ 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_LIVE, MyFrame::ToggleLive)
     EVT_MENU(SPLIT_SETPOSITION, MyFrame::SetPosition)
     EVT_MENU(SPLIT_SETMINSIZE, MyFrame::SetMinSize)

+    EVT_MENU(SPLIT_SETGRAVITY, MyFrame::SetGravity)

 
     EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
 
 
     EVT_MENU(SPLIT_QUIT, MyFrame::Quit)
 


@@ -172,11 +175,13 @@ 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
     wxMenu *splitMenu = new wxMenu;
 
     // Make a menubar
     wxMenu *splitMenu = new wxMenu;


@@ -200,6 +205,9 @@ MyFrame::MyFrame()
     splitMenu->Append(SPLIT_SETMINSIZE,
                       _T("Set &min size\tCtrl-M"),
                       _T("Set minimum pane size"));
     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_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));
     splitMenu->AppendSeparator();
 
     splitMenu->Append(SPLIT_QUIT, _T("E&xit\tAlt-X"), _T("Exit"));


@@ -209,8 +217,10 @@ MyFrame::MyFrame()
 
     SetMenuBar(menuBar);
 
 
     SetMenuBar(menuBar);
 

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

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

+    
+    m_splitter->SetSashGravity(1.0);

 
 #if 1
     m_left = new MyCanvas(m_splitter, true);
 
 #if 1
     m_left = new MyCanvas(m_splitter, true);


@@ -222,60 +232,64 @@ 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, _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);

-}
-
-MyFrame::~MyFrame()
-{
+#endif // wxUSE_STATUSBAR

 }
 
 // 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 )
 }
 
 void MyFrame::ToggleLive(wxCommandEvent& event )


@@ -319,8 +333,25 @@ void MyFrame::SetMinSize(wxCommandEvent& WXUNUSED(event) )
 
     int minsize = wxStrtol( str, (wxChar**)NULL, 10 );
     m_splitter->SetMinimumPaneSize(minsize);
 
     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::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

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


@@ -345,16 +376,16 @@ 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,
                                    wxSP_3D | wxSP_LIVE_UPDATE |
                                    wxCLIP_CHILDREN /* | wxSP_NO_XP_THEME */ )
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_3D | wxSP_LIVE_UPDATE |
                                    wxCLIP_CHILDREN /* | wxSP_NO_XP_THEME */ )


@@ -380,14 +411,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();
 }


@@ -397,16 +432,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);