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

Fix mingw warning: passing NULL to non-pointer argument.

Browse Source 
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2014-09-10 14:56:05 +00:00
parent 31350e35cf
commit 6609b57dd7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/taskbarbutton.h
View File

@@ -15,15 +15,15 @@
#include "wx/defs.h" #include "wx/defs.h"
// ----------------------------------------------------------------------------
// wxTaskBarButton: define wxTaskBarButton interface.
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxTaskBarButton; class WXDLLIMPEXP_FWD_CORE wxTaskBarButton;
class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListCategory; class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListCategory;
class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpList; class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpList;
class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListImpl; class WXDLLIMPEXP_FWD_CORE wxTaskBarJumpListImpl;
// ----------------------------------------------------------------------------
// wxTaskBarButton: define wxTaskBarButton interface.
// ----------------------------------------------------------------------------
/** /**
State of the task bar button. State of the task bar button.
*/ */

2
src/msw/taskbarbutton.cpp
View File

@@ -1428,7 +1428,7 @@ void wxTaskBarJumpListImpl::LoadKnownCategory(const wxString& title)
hr = docList->GetList hr = docList->GetList
( (
title == "Recent" ? ADLT_RECENT : ADLT_FREQUENT, title == "Recent" ? ADLT_RECENT : ADLT_FREQUENT,
NULL, 0,
wxIID_IObjectArray, wxIID_IObjectArray,
reinterpret_cast<void **>(&array) reinterpret_cast<void **>(&array)
); );