adding raster op hook

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

diff --git a/include/wx/palmos/taskbar.h b/include/wx/palmos/taskbar.h
index e6063d182f67008f2f99de3d872303456d957ab7..5c3231b8984d7529f6916f2522b8d5ab3d9332ff 100644 (file)
--- a/include/wx/palmos/taskbar.h
+++ b/include/wx/palmos/taskbar.h
@@ -1,22 +1,17 @@
 /////////////////////////////////////////////////////////////////////////
 // File:        wx/palmos/taskbar.h
 /////////////////////////////////////////////////////////////////////////
 // File:        wx/palmos/taskbar.h

-// Purpose:     Defines wxTaskBarIcon class for manipulating icons on the
-//              task bar.
-// Author:      Julian Smart
-// Modified by: Vaclav Slavik
-// Created:     24/3/98
+// Purpose:     Defines wxTaskBarIcon class.
+// Author:      William Osborne - minimal working wxPalmOS port
+// Modified by:
+// Created:     10/13/04

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

-// Copyright:   (c) Julian Smart
+// Copyright:   (c) William Osborne

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 

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

 #include "wx/icon.h"
 
 // private helper class:
 #include "wx/icon.h"
 
 // private helper class:


@@ -38,19 +33,6 @@ public:
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu); //, int x, int y);
 
     bool RemoveIcon(void);
     bool PopupMenu(wxMenu *menu); //, int x, int y);
 

-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED( bool IsOK() const );
-
-// Overridables
-    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&);
-#endif
-

 // Implementation
 protected:
     friend class wxTaskBarIconWindow;
 // Implementation
 protected:
     friend class wxTaskBarIconWindow;


@@ -63,24 +45,7 @@ protected:
     bool                 m_iconAdded;
     wxIcon               m_icon;
     wxString             m_strTooltip;
     bool                 m_iconAdded;
     wxIcon               m_icon;
     wxString             m_strTooltip;

-
-#if WXWIN_COMPATIBILITY_2_4
-    // non-virtual default event handlers to forward events to the virtuals
-    void _OnMouseMove(wxTaskBarIconEvent&);
-    void _OnLButtonDown(wxTaskBarIconEvent&);
-    void _OnLButtonUp(wxTaskBarIconEvent&);
-    void _OnRButtonDown(wxTaskBarIconEvent&);
-    void _OnRButtonUp(wxTaskBarIconEvent&);
-    void _OnLButtonDClick(wxTaskBarIconEvent&);
-    void _OnRButtonDClick(wxTaskBarIconEvent&);
-
-    DECLARE_EVENT_TABLE()
-#endif

 };
 
 };
 

-#if WXWIN_COMPATIBILITY_2_4
-inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
-#endif
-

 #endif
     // _TASKBAR_H_
 #endif
     // _TASKBAR_H_