diff options
| author | B Stack <bgstack15@gmail.com> | 2020-05-17 17:14:47 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-05-17 17:14:47 +0000 |
| commit | cca3f71f16f85f5d506bf4bb7b3ec38fda31516a (patch) | |
| tree | 1f52055b2f26fc2389d3ab4eb8d8d1e234a6316a /wx+/image_resources.h | |
| parent | Merge branch '10.23' into 'master' (diff) | |
| parent | add upstream 10.24 (diff) | |
| download | FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.gz FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.bz2 FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.zip | |
Merge branch '10.24' into 'master'
add upstream 10.24
See merge request opensource-tracking/FreeFileSync!21
Diffstat (limited to 'wx+/image_resources.h')
| -rw-r--r-- | wx+/image_resources.h | 7 |
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 |