X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..34326da778583ca8eab95f2e41738da2852a5a16:/samples/splitter/splitter.cpp?ds=inline diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp index a25419d30e..438d2cb0da 100644 --- 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 -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -39,7 +39,7 @@ #include "wx/splitter.h" #include "wx/dcmirror.h" -#ifndef __WXMSW__ +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -60,7 +60,8 @@ enum SPLIT_SETPOSITION, SPLIT_SETMINSIZE, SPLIT_SETGRAVITY, - SPLIT_REPLACE + SPLIT_REPLACE, + SPLIT_INVISIBLE }; // ---------------------------------------------------------------------------- @@ -99,6 +100,7 @@ public: void OnSetMinSize(wxCommandEvent& event); void OnSetGravity(wxCommandEvent& event); void OnReplace(wxCommandEvent &event); + void OnToggleInvisible(wxCommandEvent &event); void OnQuit(wxCommandEvent& event); @@ -106,6 +108,7 @@ public: void OnUpdateUIHorizontal(wxUpdateUIEvent& event); void OnUpdateUIVertical(wxUpdateUIEvent& event); void OnUpdateUIUnsplit(wxUpdateUIEvent& event); + void OnUpdateUIInvisible(wxUpdateUIEvent& event); private: wxScrolledWindow *m_left, *m_right; @@ -187,17 +190,19 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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() - : wxFrame(NULL, wxID_ANY, _T("wxSplitterWindow sample"), + : wxFrame(NULL, wxID_ANY, wxT("wxSplitterWindow sample"), wxDefaultPosition, wxSize(420, 300), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { @@ -210,53 +215,62 @@ MyFrame::MyFrame() // 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, - _T("Split &Horizontally\tCtrl-H"), - _T("Split horizontally")); + wxT("Split &Horizontally\tCtrl-H"), + wxT("Split horizontally")); 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, - _T("&Live update\tCtrl-L"), - _T("Toggle live update mode")); + wxT("&Live update\tCtrl-L"), + wxT("Toggle live update mode")); splitMenu->AppendCheckItem(SPLIT_BORDER, - _T("3D &Border"), - _T("Toggle wxSP_BORDER flag")); + wxT("3D &Border"), + wxT("Toggle wxSP_BORDER flag")); splitMenu->Check(SPLIT_BORDER, true); splitMenu->AppendCheckItem(SPLIT_3DSASH, - _T("&3D Sash"), - _T("Toggle wxSP_3DSASH flag")); + wxT("&3D Sash"), + wxT("Toggle wxSP_3DSASH flag")); splitMenu->Check(SPLIT_3DSASH, true); 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, - _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, - _T("Set &gravity\tCtrl-G"), - _T("Set gravity of sash")); + wxT("Set &gravity\tCtrl-G"), + wxT("Set gravity of sash")); splitMenu->AppendSeparator(); splitMenu->Append(SPLIT_REPLACE, - _T("&Replace right window"), - _T("Replace right window")); + wxT("&Replace right window"), + wxT("Replace right window")); 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; - menuBar->Append(splitMenu, _T("&Splitter")); + menuBar->Append(splitMenu, wxT("&Splitter")); SetMenuBar(menuBar); menuBar->Check(SPLIT_LIVE, true); 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 @@ -269,8 +283,8 @@ MyFrame::MyFrame() 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, wxID_ANY, _T("first text")); - m_right = new wxTextCtrl(m_splitter, wxID_ANY, _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 @@ -283,17 +297,16 @@ MyFrame::MyFrame() #endif #if wxUSE_STATUSBAR - SetStatusText(_T("Min pane size = 0"), 1); + SetStatusText(wxT("Min pane size = 0"), 1); #endif // wxUSE_STATUSBAR - m_replacewindow = (wxWindow *)0; + m_replacewindow = NULL; } MyFrame::~MyFrame() { if (m_replacewindow) { m_replacewindow->Destroy(); - m_replacewindow = (wxWindow *)0; } } @@ -311,9 +324,10 @@ void MyFrame::OnSplitHorizontal(wxCommandEvent& WXUNUSED(event) ) m_left->Show(true); m_right->Show(true); m_splitter->SplitHorizontally( m_left, m_right ); + m_replacewindow = NULL; #if wxUSE_STATUSBAR - SetStatusText(_T("Splitter split horizontally"), 1); + SetStatusText(wxT("Splitter split horizontally"), 1); #endif // wxUSE_STATUSBAR } @@ -324,9 +338,10 @@ void MyFrame::OnSplitVertical(wxCommandEvent& WXUNUSED(event) ) m_left->Show(true); m_right->Show(true); m_splitter->SplitVertically( m_left, m_right ); + m_replacewindow = NULL; #if wxUSE_STATUSBAR - SetStatusText(_T("Splitter split vertically"), 1); + SetStatusText(wxT("Splitter split vertically"), 1); #endif // wxUSE_STATUSBAR } @@ -335,7 +350,7 @@ void MyFrame::OnUnsplit(wxCommandEvent& WXUNUSED(event) ) if ( m_splitter->IsSplit() ) m_splitter->Unsplit(); #if wxUSE_STATUSBAR - SetStatusText(_T("No splitter")); + SetStatusText(wxT("No splitter")); #endif // wxUSE_STATUSBAR } @@ -360,7 +375,7 @@ void MyFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event) ) wxString str; str.Printf( wxT("%d"), m_splitter->GetSashPosition()); #if wxUSE_TEXTDLG - str = wxGetTextFromUser(_T("Enter splitter position:"), _T(""), str, this); + str = wxGetTextFromUser(wxT("Enter splitter position:"), wxT(""), str, this); #endif if ( str.empty() ) return; @@ -368,13 +383,13 @@ void MyFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event) ) 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); - wxLogStatus(this, _T("Splitter position set to %ld"), pos); + wxLogStatus(this, wxT("Splitter position set to %ld"), pos); } void MyFrame::OnSetMinSize(wxCommandEvent& WXUNUSED(event) ) @@ -382,7 +397,7 @@ void MyFrame::OnSetMinSize(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); + str = wxGetTextFromUser(wxT("Enter minimal size for panes:"), wxT(""), str, this); #endif if ( str.empty() ) return; @@ -400,7 +415,7 @@ void MyFrame::OnSetGravity(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); + str = wxGetTextFromUser(wxT("Enter sash gravity (0,1):"), wxT(""), str, this); #endif if ( str.empty() ) return; @@ -415,19 +430,26 @@ void MyFrame::OnSetGravity(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnReplace(wxCommandEvent& WXUNUSED(event) ) { - if (m_replacewindow == 0) { + 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 = 0; + m_replacewindow = NULL; empty->Destroy(); } } +void MyFrame::OnToggleInvisible(wxCommandEvent& WXUNUSED(event) ) +{ + m_splitter->SetSashInvisible(!m_splitter->IsSashInvisible()); + m_splitter->SizeWindows(); +} + // Update UI handlers void MyFrame::OnUpdateUIHorizontal(wxUpdateUIEvent& event) @@ -445,6 +467,11 @@ void MyFrame::OnUpdateUIUnsplit(wxUpdateUIEvent& event) event.Enable( m_splitter->IsSplit() ); } +void MyFrame::OnUpdateUIInvisible(wxUpdateUIEvent& event) +{ + event.Check( m_splitter->IsSashInvisible() ); +} + // ---------------------------------------------------------------------------- // MySplitterWindow // ---------------------------------------------------------------------------- @@ -469,7 +496,7 @@ MySplitterWindow::MySplitterWindow(wxFrame *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(); @@ -477,7 +504,7 @@ void MySplitterWindow::OnPositionChanged(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(); @@ -486,7 +513,7 @@ void MySplitterWindow::OnPositionChanging(wxSplitterEvent& event) void MySplitterWindow::OnDClick(wxSplitterEvent& event) { #if wxUSE_STATUSBAR - m_frame->SetStatusText(_T("Splitter double clicked"), 1); + m_frame->SetStatusText(wxT("Splitter double clicked"), 1); #endif // wxUSE_STATUSBAR event.Skip(); @@ -495,7 +522,7 @@ void MySplitterWindow::OnDClick(wxSplitterEvent& event) void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event) { #if wxUSE_STATUSBAR - m_frame->SetStatusText(_T("Splitter unsplit"), 1); + m_frame->SetStatusText(wxT("Splitter unsplit"), 1); #endif // wxUSE_STATUSBAR event.Skip(); @@ -520,7 +547,7 @@ void MyCanvas::OnDraw(wxDC& dcOrig) dc.DrawLine(0, 0, 100, 200); dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); - dc.DrawText(_T("Testing"), 50, 50); + dc.DrawText(wxT("Testing"), 50, 50); dc.SetPen(*wxRED_PEN); dc.SetBrush(*wxGREEN_BRUSH);