Removed duplicate xh_grid.cpp/h and rebaked files

[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..f0b597583f72056c9022110fe2a681d3606f8107 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -12,10 +12,6 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarosx.h"
-#endif
-
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMenu;
 
@@ -45,17 +41,19 @@ public:
     //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* DoCreatePopupMenu();
 
 protected:
     wxTaskBarIconType m_nType;
-    void* m_pEvent;
     void* m_pEventHandlerRef;
     wxMenu* m_pMenu;
+    WXHMENU m_theLastMenu;
     bool m_iconAdded;
-        
+    
+    void OnRightDown(wxTaskBarIconEvent& evt);
+    
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
 #endif