From 2458daa72859a8307ab18a18b38b9da6c13a8d7d Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 7 Jan 2007 17:28:18 +0000 Subject: [PATCH] Make it easier to switch between native and generic sample for testing purposes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/listctrl/listtest.cpp | 10 ++++++++++ samples/listctrl/listtest.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp index 17d18c235b..b4252ebb22 100644 --- a/samples/listctrl/listtest.cpp +++ b/samples/listctrl/listtest.cpp @@ -42,6 +42,7 @@ #include "wx/timer.h" // for wxStopWatch #include "wx/colordlg.h" // for wxGetColourFromUser #include "wx/settings.h" +#include "wx/sysopt.h" #include "listtest.h" @@ -91,6 +92,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LIST_FREEZE, MyFrame::OnFreeze) EVT_MENU(LIST_THAW, MyFrame::OnThaw) EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines) + EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric) EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo) EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel) @@ -222,6 +224,9 @@ MyFrame::MyFrame(const wxChar *title) menuView->Append(LIST_SMALL_ICON_TEXT_VIEW, _T("Small icon &view with text\tF6")); menuView->Append(LIST_VIRTUAL_VIEW, _T("&Virtual view\tF7")); menuView->Append(LIST_SMALL_VIRTUAL_VIEW, _T("Small virtual vie&w\tF8")); +#ifdef __WXMAC__ + menuView->AppendCheckItem(LIST_MAC_USE_GENERIC, _T("Mac: Use Generic Control")); +#endif wxMenu *menuList = new wxMenu; menuList->Append(LIST_FOCUS_LAST, _T("&Make last item current\tCtrl-L")); @@ -340,6 +345,11 @@ void MyFrame::OnToggleLines(wxCommandEvent& event) m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked()); } +void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event) +{ + wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked()); +} + void MyFrame::OnFocusLast(wxCommandEvent& WXUNUSED(event)) { long index = m_listCtrl->GetItemCount() - 1; diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h index 600eaf4b1a..03ce8f19d0 100644 --- a/samples/listctrl/listtest.h +++ b/samples/listctrl/listtest.h @@ -136,6 +136,7 @@ protected: void OnFreeze(wxCommandEvent& event); void OnThaw(wxCommandEvent& event); void OnToggleLines(wxCommandEvent& event); + void OnToggleMacUseGeneric(wxCommandEvent& event); void OnUpdateShowColInfo(wxUpdateUIEvent& event); void OnUpdateToggleMultiSel(wxUpdateUIEvent& event); @@ -203,6 +204,7 @@ enum LIST_FREEZE, LIST_THAW, LIST_TOGGLE_LINES, + LIST_MAC_USE_GENERIC, LIST_CTRL = 1000 }; -- 2.45.2