X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9174364320602d6ec18a01935005013984bb59a4..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/gdicmn.h?ds=inline

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index c7a9388fc3..9072ef7230 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -240,8 +240,14 @@ public:
     wxSize& operator-=(const wxSize& sz) { x -= sz.x; y -= sz.y; return *this; }
     wxSize& operator/=(int i) { x /= i; y /= i; return *this; }
     wxSize& operator*=(int i) { x *= i; y *= i; return *this; }
-    wxSize& operator/=(double i) { x /= i; y /= i; return *this; }
-    wxSize& operator*=(double i) { x *= i; y *= i; return *this; }
+    wxSize& operator/=(unsigned int i) { x /= i; y /= i; return *this; }
+    wxSize& operator*=(unsigned int i) { x *= i; y *= i; return *this; }
+    wxSize& operator/=(long i) { x /= i; y /= i; return *this; }
+    wxSize& operator*=(long i) { x *= i; y *= i; return *this; }
+    wxSize& operator/=(unsigned long i) { x /= i; y /= i; return *this; }
+    wxSize& operator*=(unsigned long i) { x *= i; y *= i; return *this; }
+    wxSize& operator/=(double i) { x = int(x/i); y = int(y/i); return *this; }
+    wxSize& operator*=(double i) { x = int(x*i); y = int(y*i); return *this; }
 
     void IncTo(const wxSize& sz)
         { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
@@ -320,16 +326,61 @@ inline wxSize operator*(int i, const wxSize& s)
     return wxSize(s.x * i, s.y * i);
 }
 
-inline wxSize operator*(const wxSize& s, double i)
+inline wxSize operator/(const wxSize& s, unsigned int i)
+{
+    return wxSize(s.x / i, s.y / i);
+}
+
+inline wxSize operator*(const wxSize& s, unsigned int i)
 {
     return wxSize(s.x * i, s.y * i);
 }
 
-inline wxSize operator*(double i, const wxSize& s)
+inline wxSize operator*(unsigned int i, const wxSize& s)
+{
+    return wxSize(s.x * i, s.y * i);
+}
+
+inline wxSize operator/(const wxSize& s, long i)
+{
+    return wxSize(s.x / i, s.y / i);
+}
+
+inline wxSize operator*(const wxSize& s, long i)
+{
+    return wxSize(s.x * i, s.y * i);
+}
+
+inline wxSize operator*(long i, const wxSize& s)
+{
+    return wxSize(s.x * i, s.y * i);
+}
+
+inline wxSize operator/(const wxSize& s, unsigned long i)
+{
+    return wxSize(s.x / i, s.y / i);
+}
+
+inline wxSize operator*(const wxSize& s, unsigned long i)
 {
     return wxSize(s.x * i, s.y * i);
 }
 
+inline wxSize operator*(unsigned long i, const wxSize& s)
+{
+    return wxSize(s.x * i, s.y * i);
+}
+
+inline wxSize operator*(const wxSize& s, double i)
+{
+    return wxSize(int(s.x * i), int(s.y * i));
+}
+
+inline wxSize operator*(double i, const wxSize& s)
+{
+    return wxSize(int(s.x * i), int(s.y * i));
+}
+
 
 
 // ---------------------------------------------------------------------------
@@ -731,6 +782,7 @@ public:
         FONT_SWISS,
         PEN_BLACK,
         PEN_BLACKDASHED,
+        PEN_BLUE,
         PEN_CYAN,
         PEN_GREEN,
         PEN_GREY,
@@ -760,7 +812,7 @@ protected:
 
     static wxObject* ms_stockObject[ITEMCOUNT];
 
-    DECLARE_NO_COPY_CLASS(wxStockGDI)
+    wxDECLARE_NO_COPY_CLASS(wxStockGDI);
 };
 
 #define wxITALIC_FONT  wxStockGDI::instance().GetFont(wxStockGDI::FONT_ITALIC)
@@ -770,6 +822,7 @@ protected:
 
 #define wxBLACK_DASHED_PEN  wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED)
 #define wxBLACK_PEN         wxStockGDI::GetPen(wxStockGDI::PEN_BLACK)
+#define wxBLUE_PEN          wxStockGDI::GetPen(wxStockGDI::PEN_BLUE)
 #define wxCYAN_PEN          wxStockGDI::GetPen(wxStockGDI::PEN_CYAN)
 #define wxGREEN_PEN         wxStockGDI::GetPen(wxStockGDI::PEN_GREEN)
 #define wxGREY_PEN          wxStockGDI::GetPen(wxStockGDI::PEN_GREY)