X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed32fb5b2114b2c00e1e1de253cd466c9e849d28..2f6ea0bc00b909640f3b5696685227b574b360ac:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 0c27e93a9b..bc7cd6d114 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; } @@ -494,6 +497,8 @@ public: #endif }; +WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap); + class WXDLLEXPORT wxColourDatabase { public: