X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63d690d7c578eb7b0b102c1703e04eb0310f9d8c..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index a2d2d8e087..26db204d41 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -24,12 +24,14 @@ #include "wx/frame.h" #include "wx/utils.h" #include "wx/menu.h" + #include "wx/app.h" #endif #include "wx/msw/wrapshl.h" #include #include "wx/taskbar.h" +#include "wx/msw/private.h" #include "wx/dynlib.h" #ifndef NIN_BALLOONTIMEOUT @@ -55,9 +57,9 @@ #ifndef NOTIFYICONDATA_V2_SIZE #ifdef UNICODE - #define NOTIFYICONDATA_V2_SIZE 0x03A8; + #define NOTIFYICONDATA_V2_SIZE 0x03A8 #else - #define NOTIFYICONDATA_V2_SIZE 0x01E8; + #define NOTIFYICONDATA_V2_SIZE 0x01E8 #endif #endif @@ -213,7 +215,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) NotifyIconData notifyData(GetHwndOf(m_win)); - if (icon.Ok()) + if (icon.IsOk()) { notifyData.uFlags |= NIF_ICON; notifyData.hIcon = GetHiconOf(icon);