drawer sample mods from ABX (with only one mod - _CODE Added to #define USE_DRAWER 0)

[wxWidgets.git] / samples / drawer / drawertest.h

diff --git a/samples/drawer/drawertest.h b/samples/drawer/drawertest.h
index be2613b4cf195679f37d979c8f83bdec18158dfa..0555ccae30268bb259151dee575e04c5e401873d 100644 (file)
--- a/samples/drawer/drawertest.h
+++ b/samples/drawer/drawertest.h
@@ -9,19 +9,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+    #define USE_DRAWER_CODE 1
+#else
+    #define USE_DRAWER_CODE 0
+#endif
+

 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
     MyTaskBarIcon() {};
 
 class MyTaskBarIcon: public wxTaskBarIcon
 {
 public:
     MyTaskBarIcon() {};
 

-    void OnLButtonDClick(wxTaskBarIconEvent&);
+    void OnLeftButtonDClick(wxTaskBarIconEvent&);

     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
 
     void OnMenuSetNewIcon(wxCommandEvent&);
     void OnMenuSetOldIcon(wxCommandEvent&);
 
     void OnMenuRestore(wxCommandEvent&);
     void OnMenuExit(wxCommandEvent&);
 
     void OnMenuSetNewIcon(wxCommandEvent&);
     void OnMenuSetOldIcon(wxCommandEvent&);
 

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if USE_DRAWER_CODE

     class MyDrawer* m_pMyDrawer;
     MyTaskBarIcon(class MyDrawer* p) {m_pMyDrawer = p;}
 
     class MyDrawer* m_pMyDrawer;
     MyTaskBarIcon(class MyDrawer* p) {m_pMyDrawer = p;}
 


@@ -32,7 +38,7 @@ public:
     void OnMenuRightDrawer(wxCommandEvent&);
     void OnMenuTopDrawer(wxCommandEvent&);
     void OnMenuBottomDrawer(wxCommandEvent&);
     void OnMenuRightDrawer(wxCommandEvent&);
     void OnMenuTopDrawer(wxCommandEvent&);
     void OnMenuBottomDrawer(wxCommandEvent&);

-#endif //10.2+
+#endif // USE_DRAWER_CODE

 
     virtual wxMenu *CreatePopupMenu();
 
 
     virtual wxMenu *CreatePopupMenu();