X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dda36afd4abc7fb609ec97171dbae3f890d6ec71..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/taskbar.h diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h index 2d056d574e..9533b19bc4 100644 --- a/include/wx/msw/taskbar.h +++ b/include/wx/msw/taskbar.h @@ -13,10 +13,6 @@ #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: @@ -38,19 +34,6 @@ public: 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; @@ -64,23 +47,7 @@ protected: 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_