From f0f3f094c5fa05bafe1963d1ea13f1be39a6673b Mon Sep 17 00:00:00 2001 From: B Stack Date: Sun, 17 May 2020 11:17:28 -0400 Subject: add upstream 10.24 --- wx+/image_resources.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'wx+/image_resources.h') diff --git a/wx+/image_resources.h b/wx+/image_resources.h index ff1d5648..b996d977 100644 --- a/wx+/image_resources.h +++ b/wx+/image_resources.h @@ -14,11 +14,12 @@ namespace zen { -void initResourceImages(const Zstring& zipPath); //pass resources .zip file at application startup +//pass resources .zip file at application startup +void initResourceImages(const Zstring& zipPath); //throw FileError void cleanupResourceImages(); -const wxBitmap& getResourceImage (const wxString& name); -const wxAnimation& getResourceAnimation(const wxString& name); +const wxBitmap& getResourceImage (const std::string& name); +const wxAnimation& getResourceAnimation(const std::string& name); } #endif //IMAGE_RESOURCES_H_8740257825342532457 -- cgit