X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/430bdeb55beb289cffd289f13735e0227570170d..4ff56dd15287c27a545a3da710cdb890288ddcce:/samples/splitter/splitter.cpp?ds=sidebyside diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp index b95e2e75ed..0ed8ae07f2 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,6 +39,10 @@ #include "wx/splitter.h" #include "wx/dcmirror.h" +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -70,7 +74,7 @@ public: virtual bool OnInit(); - DECLARE_NO_COPY_CLASS(MyApp) + wxDECLARE_NO_COPY_CLASS(MyApp); }; class MyFrame: public wxFrame @@ -110,7 +114,7 @@ private: wxWindow *m_replacewindow; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(MyFrame) + wxDECLARE_NO_COPY_CLASS(MyFrame); }; class MySplitterWindow : public wxSplitterWindow @@ -128,7 +132,7 @@ private: wxFrame *m_frame; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(MySplitterWindow) + wxDECLARE_NO_COPY_CLASS(MySplitterWindow); }; class MyCanvas: public wxScrolledWindow @@ -142,7 +146,7 @@ public: private: bool m_mirror; - DECLARE_NO_COPY_CLASS(MyCanvas) + wxDECLARE_NO_COPY_CLASS(MyCanvas); }; // ============================================================================ @@ -193,10 +197,12 @@ 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) { + SetIcon(wxICON(sample)); + #if wxUSE_STATUSBAR CreateStatusBar(2); #endif // wxUSE_STATUSBAR @@ -204,53 +210,59 @@ 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->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 @@ -263,8 +275,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 @@ -277,17 +289,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; } } @@ -305,9 +316,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 } @@ -318,9 +330,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 } @@ -329,7 +342,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 } @@ -354,7 +367,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; @@ -362,13 +375,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) ) @@ -376,7 +389,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; @@ -394,7 +407,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; @@ -409,15 +422,16 @@ 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(); } } @@ -463,7 +477,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(); @@ -471,7 +485,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(); @@ -480,7 +494,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(); @@ -489,7 +503,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(); @@ -514,7 +528,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);