X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cef71bc23a9cd0ec543e451848fb9e88ace36e9..68df211faedeabdf4259858109d1bd7385fdccf5:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index a777e23621..c5b9b9b5c1 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// File: taskbar.cpp +// File: src/msw/taskbar.cpp // Purpose: Implements wxTaskBarIcon class for manipulating icons on // the Windows task bar. // Author: Julian Smart @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "taskbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,8 +25,6 @@ #include "wx/menu.h" #endif -#if defined(__WIN95__) - #include "wx/msw/private.h" #include "wx/msw/winundef.h" @@ -143,8 +137,8 @@ wxTaskBarIcon::~wxTaskBarIcon() // Operations bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) { - // NB: we have to create the window lazily because of backward compatiblity, - // old aplications may create wxTaskBarIcon instance before wxApp + // NB: we have to create the window lazily because of backward compatibility, + // old applications may create a wxTaskBarIcon instance before wxApp // is initialized (as samples/taskbar used to do) if (!m_win) { @@ -329,5 +323,3 @@ long wxTaskBarIcon::WindowProc(unsigned int msg, return 0; } - -#endif // __WIN95__