summaryrefslogtreecommitdiff
path: root/wx+/image_resources.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-05-17 11:17:28 -0400
committerB Stack <bgstack15@gmail.com>2020-05-17 11:17:28 -0400
commitf0f3f094c5fa05bafe1963d1ea13f1be39a6673b (patch)
tree1f52055b2f26fc2389d3ab4eb8d8d1e234a6316a /wx+/image_resources.h
parentMerge branch '10.23' into 'master' (diff)
downloadFreeFileSync-f0f3f094c5fa05bafe1963d1ea13f1be39a6673b.tar.gz
FreeFileSync-f0f3f094c5fa05bafe1963d1ea13f1be39a6673b.tar.bz2
FreeFileSync-f0f3f094c5fa05bafe1963d1ea13f1be39a6673b.zip
add upstream 10.24
Diffstat (limited to 'wx+/image_resources.h')
-rw-r--r--wx+/image_resources.h7
1 files changed, 4 insertions, 3 deletions
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
bgstack15