X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed32fb5b2114b2c00e1e1de253cd466c9e849d28..4bc4bae18573d2e8111ed0df0061f32a012f04dd:/include/wx/gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 0c27e93a9b..07e68c9c21 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -20,6 +20,7 @@
 #include "wx/list.h"
 #include "wx/string.h"
 #include "wx/fontenc.h"
+#include "wx/hashmap.h"
 #include "wx/math.h"
 
 // ---------------------------------------------------------------------------
@@ -36,7 +37,6 @@ class WXDLLIMPEXP_CORE wxPalette;
 class WXDLLIMPEXP_CORE wxPen;
 class WXDLLIMPEXP_CORE wxRegion;
 class WXDLLIMPEXP_BASE wxString;
-class wxStringToColourHashMap;
 
 // ---------------------------------------------------------------------------
 // constants
@@ -229,6 +229,9 @@ public:
     void DecTo(const wxSize& sz)
         { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; }
 
+    void Scale(float xscale, float yscale)
+        { x = (int)(x*xscale); y = (int)(y*yscale); }
+
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
     void SetWidth(int w) { x = w; }
@@ -414,6 +417,8 @@ public:
     // return true if the point is (not strcitly) inside the rect
     bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
+    // return true if the rectangle is (not strcitly) inside the rect
+    bool Inside(const wxRect& rect) const;
 
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
@@ -494,6 +499,8 @@ public:
 #endif
 };
 
+WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
+
 class WXDLLEXPORT wxColourDatabase
 {
 public:
@@ -534,7 +541,7 @@ public:
 #if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif
-    ~wxResourceCache();
+    virtual ~wxResourceCache();
 };
 
 // ---------------------------------------------------------------------------