From 6609b57dd7b37b3eb0a78d65159a0bee53a1fdaa Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Wed, 10 Sep 2014 14:56:05 +0000 Subject: [PATCH] Fix mingw warning: passing NULL to non-pointer argument. Author: Chaobin Zhang git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/taskbarbutton.h | 8 ++++---- src/msw/taskbarbutton.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h index b6b404efe0..5848e7c8d3 100644 --- a/include/wx/taskbarbutton.h +++ b/include/wx/taskbarbutton.h @@ -15,15 +15,15 @@ #include "wx/defs.h" -// ---------------------------------------------------------------------------- -// wxTaskBarButton: define wxTaskBarButton interface. -// ---------------------------------------------------------------------------- - class WXDLLIMPEXP_FWD_CORE wxTaskBarButton; class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListCategory; class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpList; class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListImpl; +// ---------------------------------------------------------------------------- +// wxTaskBarButton: define wxTaskBarButton interface. +// ---------------------------------------------------------------------------- + /** State of the task bar button. */ diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp index b23db8d09f..ebc5918daa 100644 --- a/src/msw/taskbarbutton.cpp +++ b/src/msw/taskbarbutton.cpp @@ -1428,7 +1428,7 @@ void wxTaskBarJumpListImpl::LoadKnownCategory(const wxString& title) hr = docList->GetList ( title == "Recent" ? ADLT_RECENT : ADLT_FREQUENT, - NULL, + 0, wxIID_IObjectArray, reinterpret_cast(&array) );