wxMultiChoiceDialog uses now wxCheckListBox if possible, wxListBox if not

[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 644d89fb1b2f2ab890c161de8b919cd5cbe4244f..f0b597583f72056c9022110fe2a681d3606f8107 100644 (file)
--- a/include/wx/mac/carbon/taskbarosx.h
+++ b/include/wx/mac/carbon/taskbarosx.h
@@ -6,43 +6,55 @@
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton, 2003
 // Created:     04/04/2003
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton, 2003

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////
 
 #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
 {
 public:
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMenu;
 
 class WXDLLEXPORT wxTaskBarIcon : public wxTaskBarIconBase
 {
 public:

-       //type of taskbar item to create (currently only DOCK is implemented)
-       enum wxTaskBarIconType
-       {
-               DOCK,
-               STATUSITEM,
-               MENUEXTRA
-       };
-       
+        //type of taskbar item to create 
+    //TODO:  currently only DOCK is implemented
+        enum wxTaskBarIconType
+        {
+                DOCK,
+                STATUSITEM,
+                MENUEXTRA
+        };
+        

     wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
     virtual ~wxTaskBarIcon();
 
     wxTaskBarIcon(const wxTaskBarIconType& nType = DOCK);
     virtual ~wxTaskBarIcon();
 

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

     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:
     wxTaskBarIconType m_nType;
 protected:
     wxTaskBarIconType m_nType;

-       
+    void* m_pEventHandlerRef;
+    wxMenu* m_pMenu;
+    WXHMENU m_theLastMenu;
+    bool m_iconAdded;
+    
+    void OnRightDown(wxTaskBarIconEvent& evt);
+    

     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };
     DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
 };

-

 #endif
     // _TASKBAR_H_
 #endif
     // _TASKBAR_H_