added a menu command to switch between clipboard and primary selection

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

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index d36e055b5c91aceae109254ff25d774caca190eb..9533b19bc492f38366aab9fef5193885516c7765 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -13,10 +13,6 @@
 #ifndef _TASKBAR_H_
 #define _TASKBAR_H_
 
 #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,24 +34,10 @@ 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;

-    long WindowProc(WXHWND hWnd, unsigned int msg,
-                    unsigned int wParam, long lParam);
+    long WindowProc(unsigned int msg, unsigned int wParam, long lParam);

     void RegisterWindowMessages();
 
 // Data members
     void RegisterWindowMessages();
 
 // Data members


@@ -65,23 +47,7 @@ protected:
     wxIcon               m_icon;
     wxString             m_strTooltip;
 
     wxIcon               m_icon;
     wxString             m_strTooltip;
 

-#if WXWIN_COMPATIBILITY_2_4
-    // 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()
-#endif

 };
 
 };
 

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

 #endif
     // _TASKBAR_H_
 #endif
     // _TASKBAR_H_