moving Carbon Event Class out of USE_GUI

[wxWidgets.git] / include / wx / mac / carbon / taskbarosx.h

diff --git a/include/wx/mac/carbon/taskbarosx.h b/include/wx/mac/carbon/taskbarosx.h
index 2a31ec26de3620afe4db788fa3056f28e46272c7..242e8781e235dcaf25ff19488504525ba999f4cc 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -45,17 +45,17 @@ public:
     //pops up the menu
     bool PopupMenu(wxMenu *menu);
 
     //pops up the menu
     bool PopupMenu(wxMenu *menu);
 

-    //internal functions - don't call
-    void SetInternalEvent(void* pEvent);        
+    //internal functions - don't call       

     wxMenu* GetCurrentMenu();
     wxMenu* GetCurrentMenu();

+    wxMenu* DoCreatePopupMenu();

 
 protected:
     wxTaskBarIconType m_nType;
 
 protected:
     wxTaskBarIconType m_nType;

-    void* m_pEvent;

     void* m_pEventHandlerRef;
     wxMenu* m_pMenu;
     void* m_pEventHandlerRef;
     wxMenu* m_pMenu;

+    WXHMENU m_theLastMenu;

     bool m_iconAdded;
     bool m_iconAdded;

-        
+            

     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 #endif
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 #endif