diff options
| author | B Stack <bgstack15@gmail.com> | 2020-07-22 16:56:03 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2020-07-22 16:56:03 +0000 |
| commit | e5633fb1c0db91f01ab967330b76baf4ecdb0512 (patch) | |
| tree | 10260e25ae905564f7978b83fc4e316670f987c6 /wx+/image_resources.h | |
| parent | Merge branch '10.25' into 'master' (diff) | |
| parent | add upstream 11.0 (diff) | |
| download | FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.tar.gz FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.tar.bz2 FreeFileSync-e5633fb1c0db91f01ab967330b76baf4ecdb0512.zip | |
Merge branch '11.0' into 'master'11.0
add upstream 11.0
See merge request opensource-tracking/FreeFileSync!24
Diffstat (limited to 'wx+/image_resources.h')
| -rw-r--r-- | wx+/image_resources.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wx+/image_resources.h b/wx+/image_resources.h index b996d977..2ac6f308 100644 --- a/wx+/image_resources.h +++ b/wx+/image_resources.h @@ -7,7 +7,6 @@ #ifndef IMAGE_RESOURCES_H_8740257825342532457 #define IMAGE_RESOURCES_H_8740257825342532457 -#include <wx/bitmap.h> #include <wx/animate.h> #include <zen/zstring.h> @@ -15,11 +14,11 @@ namespace zen { //pass resources .zip file at application startup -void initResourceImages(const Zstring& zipPath); //throw FileError -void cleanupResourceImages(); +void imageResourcesInit(const Zstring& zipPath); //throw FileError +void ImageResourcesCleanup(); -const wxBitmap& getResourceImage (const std::string& name); -const wxAnimation& getResourceAnimation(const std::string& name); +const wxImage& loadImage(const std::string& name, int maxWidth /*optional*/, int maxHeight /*optional*/); +const wxImage& loadImage(const std::string& name, int maxSize = -1); } #endif //IMAGE_RESOURCES_H_8740257825342532457 |