typo in style definition fixed

[wxWidgets.git] / include / wx / os2 / taskbar.h

diff --git a/include/wx/os2/taskbar.h b/include/wx/os2/taskbar.h
index 7f4a36b8b4e7a125539eb4a496d77addab4dd967..12cb28a0d70d56593a568e56d6a666d501bcac96 100644 (file)
--- a/include/wx/os2/taskbar.h
+++ b/include/wx/os2/taskbar.h
@@ -2,48 +2,91 @@
 // File:        taskbar.h
 // Purpose:        Defines wxTaskBarIcon class for manipulating icons on the
 //              task bar. Optional.
 // File:        taskbar.h
 // Purpose:        Defines wxTaskBarIcon class for manipulating icons on the
 //              task bar. Optional.

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/17/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c)
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TASKBAR_H_
 #define _WX_TASKBAR_H_
 
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TASKBAR_H_
 #define _WX_TASKBAR_H_
 

-#ifdef __GNUG__
-#pragma interface "taskbar.h"
-#endif
-
+#include <wx/event.h>

 #include <wx/list.h>
 #include <wx/icon.h>
 
 #include <wx/list.h>
 #include <wx/icon.h>
 

-class wxTaskBarIcon: public wxObject
-{
+class WXDLLEXPORT wxTaskBarIcon: public wxEvtHandler {
+    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)

 public:
 public:

-       wxTaskBarIcon();
-       virtual ~wxTaskBarIcon();
+    wxTaskBarIcon(void);
+    virtual ~wxTaskBarIcon(void);

 
 // Accessors
 
 // Accessors

+    inline WXHWND GetHWND() const { return m_hWnd; }
+    inline bool IsOK() const { return (m_hWnd != 0) ; }
+    inline bool IsIconInstalled() const { return m_iconAdded; }

 
 // Operations
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");
 
 // Operations
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");

-    bool RemoveIcon();
+    bool RemoveIcon(void);
+    bool PopupMenu(wxMenu *menu); //, int x, int y);

 
 // Overridables
 
 // Overridables

-    virtual void OnMouseMove();
-    virtual void OnLButtonDown();
-    virtual void OnLButtonUp();
-    virtual void OnRButtonDown();
-    virtual void OnRButtonUp();
-    virtual void OnLButtonDClick();
-    virtual void OnRButtonDClick();
+    virtual void OnMouseMove(wxEvent&);
+    virtual void OnLButtonDown(wxEvent&);
+    virtual void OnLButtonUp(wxEvent&);
+    virtual void OnRButtonDown(wxEvent&);
+    virtual void OnRButtonUp(wxEvent&);
+    virtual void OnLButtonDClick(wxEvent&);
+    virtual void OnRButtonDClick(wxEvent&);
+
+// Implementation
+    static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
+    static void AddObject(wxTaskBarIcon* obj);
+    static void RemoveObject(wxTaskBarIcon* obj);
+    static bool RegisterWindowClass();
+    static WXHWND CreateTaskBarWindow();
+    MRESULT WindowProc( WXHWND hWnd, UINT msg, MPARAM wParam, MPARAM lParam );

 
 // Data members
 protected:
 
 // Data members
 protected:

+    WXHWND          m_hWnd;
+    bool            m_iconAdded;
+    static wxList   sm_taskBarIcons;
+    static bool     sm_registeredClass;
+    static unsigned int sm_taskbarMsg;
+
+    // non-virtual default event handlers to forward events to the virtuals
+    void _OnMouseMove(wxEvent&);
+    void _OnLButtonDown(wxEvent&);
+    void _OnLButtonUp(wxEvent&);
+    void _OnRButtonDown(wxEvent&);
+    void _OnRButtonUp(wxEvent&);
+    void _OnLButtonDClick(wxEvent&);
+    void _OnRButtonDClick(wxEvent&);
+
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+const wxEventType wxEVT_TASKBAR_MOVE =                  wxEVT_FIRST + 1550;
+const wxEventType wxEVT_TASKBAR_LEFT_DOWN =             wxEVT_FIRST + 1551;
+const wxEventType wxEVT_TASKBAR_LEFT_UP =               wxEVT_FIRST + 1552;
+const wxEventType wxEVT_TASKBAR_RIGHT_DOWN =            wxEVT_FIRST + 1553;
+const wxEventType wxEVT_TASKBAR_RIGHT_UP =              wxEVT_FIRST + 1554;
+const wxEventType wxEVT_TASKBAR_LEFT_DCLICK =           wxEVT_FIRST + 1555;
+const wxEventType wxEVT_TASKBAR_RIGHT_DCLICK =          wxEVT_FIRST + 1556;
+
+#define EVT_TASKBAR_MOVE(fn)         wxEventTableEntry(wxEVT_TASKBAR_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+#define EVT_TASKBAR_LEFT_DOWN(fn)    wxEventTableEntry(wxEVT_TASKBAR_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+#define EVT_TASKBAR_LEFT_UP(fn)      wxEventTableEntry(wxEVT_TASKBAR_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+#define EVT_TASKBAR_RIGHT_DOWN(fn)   wxEventTableEntry(wxEVT_TASKBAR_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+#define EVT_TASKBAR_RIGHT_UP(fn)     wxEventTableEntry(wxEVT_TASKBAR_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+#define EVT_TASKBAR_LEFT_DCLICK(fn)  wxEventTableEntry(wxEVT_TASKBAR_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+#define EVT_TASKBAR_RIGHT_DCLICK(fn) wxEventTableEntry(wxEVT_TASKBAR_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),
+
+

 #endif
 #endif

-    // _WX_TASKBAR_H_
+    // _TASKBAR_H_
+