only use Mac-specific menu item under Mac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 33dc23898daf96e6edea2da17b430ab0e3a98401..8fd9573f5c9b3e95a19e0937a8e0c14d3f3c8954 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -150,7 +150,9 @@ 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_FREEZE, MyFrame::OnFreeze)
     EVT_MENU(LIST_THAW, MyFrame::OnThaw)
     EVT_MENU(LIST_TOGGLE_LINES, MyFrame::OnToggleLines)

+#ifdef __WXOSX__

     EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)
     EVT_MENU(LIST_MAC_USE_GENERIC, MyFrame::OnToggleMacUseGeneric)

+#endif // __WXOSX__

 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)
 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
     EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)


@@ -346,11 +348,15 @@ void MyFrame::OnToggleLines(wxCommandEvent& event)
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 
     m_listCtrl->SetSingleStyle(wxLC_HRULES | wxLC_VRULES, event.IsChecked());
 }
 

+#ifdef __WXOSX__
+

 void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)
 {
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked());
 }
 
 void MyFrame::OnToggleMacUseGeneric(wxCommandEvent& event)
 {
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), event.IsChecked());
 }
 

+#endif // __WXOSX__
+

 void MyFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
     long index = 3;
 void MyFrame::OnGoTo(wxCommandEvent& WXUNUSED(event))
 {
     long index = 3;

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index 529e1a6140eaaaa89948731f78762a0221224705..03c79552c423b509103c6496e3ae49b117f5ce82 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -143,7 +143,9 @@ protected:
     void OnFreeze(wxCommandEvent& event);
     void OnThaw(wxCommandEvent& event);
     void OnToggleLines(wxCommandEvent& event);
     void OnFreeze(wxCommandEvent& event);
     void OnThaw(wxCommandEvent& event);
     void OnToggleLines(wxCommandEvent& event);

+#ifdef __WXOSX__

     void OnToggleMacUseGeneric(wxCommandEvent& event);
     void OnToggleMacUseGeneric(wxCommandEvent& event);

+#endif // __WXOSX__

 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
     void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
     void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);


@@ -217,7 +219,9 @@ enum
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,
     LIST_FREEZE,
     LIST_THAW,
     LIST_TOGGLE_LINES,

+#ifdef __WXOSX__

     LIST_MAC_USE_GENERIC,
     LIST_MAC_USE_GENERIC,

+#endif

 
     LIST_CTRL                   = 1000
 };
 
     LIST_CTRL                   = 1000
 };