define _TM_DEFINED if we define struct tm here

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 0c27e93a9b971a42d972acf70bd6d5e6ea47a9d0..bc7cd6d11464a6b6b25a394751eee5831dc8bf6d 100644 (file)
--- 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/list.h"
 #include "wx/string.h"
 #include "wx/fontenc.h"

+#include "wx/hashmap.h"

 #include "wx/math.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 WXDLLIMPEXP_CORE wxPen;
 class WXDLLIMPEXP_CORE wxRegion;
 class WXDLLIMPEXP_BASE wxString;

-class wxStringToColourHashMap;

 
 // ---------------------------------------------------------------------------
 // constants
 
 // ---------------------------------------------------------------------------
 // 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 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; }
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
     void SetWidth(int w) { x = w; }


@@ -494,6 +497,8 @@ public:
 #endif
 };
 
 #endif
 };
 

+WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
+

 class WXDLLEXPORT wxColourDatabase
 {
 public:
 class WXDLLEXPORT wxColourDatabase
 {
 public: