1. Moved m_usePrimary to wxClipboardBase as it's now also used by wxMSW/wxMac

[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 362d87260b932a14cb054d159ce10fa40cda66e7..43c952679a2310f27bb20977f893b8ddf30cbed1 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -12,53 +12,36 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarosx.h"
-#endif
-

 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMenu;
 
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMenu;
 
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)

 public:
 public:

-        //type of taskbar item to create 
-    //TODO:  currently only DOCK is implemented
+        // type of taskbar item to create (currently only DOCK is implemented)

         enum wxTaskBarIconType
         {
         enum wxTaskBarIconType
         {

-                DOCK,
-                STATUSITEM,
-                MENUEXTRA
+            DOCK
+//    ,   CUSTOM_STATUSITEM
+//    ,   STATUSITEM 
+//    ,   MENUEXTRA 
+        ,   DEFAULT_TYPE = DOCK

         };
         };

-        
-    wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
+
+    wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);

     virtual ~wxTaskBarIcon();
 
     virtual ~wxTaskBarIcon();
 

-    inline bool IsOk() const { return true; }
-    inline bool IsIconInstalled() const { return m_iconAdded; }
-    
-    //TODO: not tested extensively
+    bool IsOk() const { return true; }
+
+    bool IsIconInstalled() const;

     bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
     bool RemoveIcon();
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
     bool RemoveIcon();

-    //TODO: end not tested extensively
-    
-    //pops up the menu

     bool PopupMenu(wxMenu *menu);
 
     bool PopupMenu(wxMenu *menu);
 

-    //internal functions - don't call       
-    wxMenu* GetCurrentMenu();
-    wxMenu* DoCreatePopupMenu();
-

 protected:
 protected:

-    wxTaskBarIconType m_nType;
-    void* m_pEventHandlerRef;
-    wxMenu* m_pMenu;
-    WXHMENU m_theLastMenu;
-    bool m_iconAdded;
-    
-    void OnRightDown(wxTaskBarIconEvent& evt);
-    
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
+    class wxTaskBarIconImpl* m_impl;    
+    friend class wxTaskBarIconImpl;

 };
 #endif
     // _TASKBAR_H_
 };
 #endif
     // _TASKBAR_H_