From 9b8d8755362d24c51861a6903fb82929811f7b3e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 6 Apr 2008 15:46:49 +0000 Subject: [PATCH] demo toggling border and 3D sash styles (last part of patch 1927817) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/splitter/splitter.cpp | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp index af93ae1ac8..7aaf1e43aa 100644 --- a/samples/splitter/splitter.cpp +++ b/samples/splitter/splitter.cpp @@ -51,6 +51,8 @@ enum SPLIT_VERTICAL, SPLIT_UNSPLIT, SPLIT_LIVE, + SPLIT_BORDER, + SPLIT_3DSASH, SPLIT_SETPOSITION, SPLIT_SETMINSIZE, SPLIT_SETGRAVITY, @@ -81,7 +83,13 @@ public: 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); @@ -168,6 +176,8 @@ 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) @@ -206,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")); @@ -314,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; @@ -349,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; @@ -364,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; @@ -482,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); -- 2.45.2