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

Add instance argument to wxLoadUserResource().

Browse Source 
This makes it possible to load resources from other modules than the
main executable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-04-26 20:51:02 +00:00
parent 1930cbd768
commit 18923e360c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/utils.h
View File

@@ -737,7 +737,8 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
wxLoadUserResource(const void **outData,
size_t *outLen,
const wxString& resourceName,
const wxString& resourceType = wxUserResourceStr);
const wxString& resourceType = wxUserResourceStr,
WXHINSTANCE module = 0);
// This function allocates a new buffer and makes a copy of the resource
// data, remember to delete[] the buffer. And avoid using it entirely if
@@ -747,7 +748,8 @@ WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
WXDLLIMPEXP_BASE char*
wxLoadUserResource(const wxString& resourceName,
const wxString& resourceType = wxUserResourceStr,
int* pLen = NULL);
int* pLen = NULL,
WXHINSTANCE module = 0);
#endif // MSW
#endif