From ee1c8c5c25d25dfa42120125a8a45dc9831ee412 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:23:48 +0200 Subject: 5.14 --- lib/resources.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/resources.h') diff --git a/lib/resources.h b/lib/resources.h index 9081ff4e..a8d9469c 100644 --- a/lib/resources.h +++ b/lib/resources.h @@ -18,7 +18,7 @@ class GlobalResources public: static const GlobalResources& instance(); - static const wxBitmap& getImage(const wxString& name) { return instance().getImageInt(name); } + const wxBitmap& getImage(const wxString& name) const; //global image resource objects wxAnimation aniWink; @@ -30,9 +30,11 @@ private: GlobalResources(const GlobalResources&); GlobalResources& operator=(const GlobalResources&); - const wxBitmap& getImageInt(const wxString& name) const; - std::map bitmaps; }; + +inline +const wxBitmap& getResourceImage(const wxString& name) { return GlobalResources::instance().getImage(name); } + #endif // RESOURCES_H_INCLUDED -- cgit