X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86ad5903b94d00e7c7625a705f6cd22301607ccd..09e7316547fadf0998abd9eade215db7845538dd:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 8e98935c90..9822509db1 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -31,6 +31,7 @@ #include #include "wx/taskbar.h" +#include "wx/msw/private.h" #include "wx/dynlib.h" #ifndef NIN_BALLOONTIMEOUT @@ -56,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 @@ -176,7 +177,7 @@ struct NotifyIconData : public NOTIFYICONDATA // wxTaskBarIcon // ---------------------------------------------------------------------------- -wxTaskBarIcon::wxTaskBarIcon() +wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType)) { m_win = NULL; m_iconAdded = false; @@ -214,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);