Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-07 11:35:04 +00:00
parent a0369cb367
commit c1dc9f8394
73 changed files with 22 additions and 2085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/wx/msw/taskbar.h
View File

@@ -34,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;
@@ -60,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(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_