4.0

1 files changed, 11 insertions, 4 deletions

diff --git a/library/resources.h b/library/resources.h
index f812ac90..e985d9bf 100644
--- a/library/resources.h
+++ b/library/resources.h
@@ -16,9 +16,13 @@
 class GlobalResources
 {
 public:
-    static const GlobalResources& instance();
+    static const wxBitmap& getImage(const wxString& name)
+    {
+        const GlobalResources& inst = instance();
+        return inst.getImageInt(name);
+    }
 
-    const wxBitmap& getImage(const wxString& imageName) const;
+    static const GlobalResources& instance();
 
     //global image resource objects
     wxAnimation* animationMoney;
@@ -26,10 +30,13 @@ public:
     wxIcon* programIcon;
 
 private:
-    void load(); //loads bitmap resources on program startup
-
     GlobalResources();
     ~GlobalResources();
+    GlobalResources(const GlobalResources&);
+    GlobalResources& operator=(const GlobalResources&);
+
+    const wxBitmap& getImageInt(const wxString& name) const;
+
 
     //resource mapping
     std::map<wxString, wxBitmap*> bitmapResource;