Added wxPGProperty::Enable() for conveniency. Refactored related code and improved...

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

diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h
index 192a6b6bd2d6cb3b8f99d47be9d9bb4c955da3b7..2fafd4da0d041bab9e45017adb7d48242440309e 100644 (file)
--- a/interface/wx/gdicmn.h
+++ b/interface/wx/gdicmn.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxRealPoint
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -113,10 +113,10 @@ enum wxStockCursor
 
     A wxRealPoint is a useful data structure for graphics operations.
 
-    It contains floating point @e x and @e y members. 
+    It contains floating point @e x and @e y members.
     See wxPoint for an integer version.
 
-    Note that the coordinates stored inside a wxRealPoint object may be negative 
+    Note that the coordinates stored inside a wxRealPoint object may be negative
     and that wxRealPoint functions do not perform any check against negative values.
 
     @library{wxcore}
@@ -137,6 +137,48 @@ public:
     */
     wxRealPoint(double x, double y);
 
+    /**
+        Converts the given wxPoint (with integer coordinates) to a wxRealPoint.
+    */
+    wxRealPoint(const wxPoint& pt);
+
+    /**
+        @name Miscellaneous operators
+
+        Note that these operators are documented as class members
+        (to make them easier to find) but, as their prototype shows,
+        they are implemented as global operators; note that this is
+        transparent to the user but it helps to understand why the
+        following functions are documented to take the wxPoint they
+        operate on as an explicit argument.
+    */
+    //@{
+    wxRealPoint& operator=(const wxRealPoint& pt);
+
+    bool operator ==(const wxRealPoint& p1, const wxRealPoint& p2);
+    bool operator !=(const wxRealPoint& p1, const wxRealPoint& p2);
+
+    wxRealPoint operator +(const wxRealPoint& p1, const wxRealPoint& p2);
+    wxRealPoint operator -(const wxRealPoint& p1, const wxRealPoint& p2);
+
+    wxRealPoint& operator +=(const wxRealPoint& pt);
+    wxRealPoint& operator -=(const wxRealPoint& pt);
+
+    wxRealPoint operator +(const wxRealPoint& pt, const wxSize& sz);
+    wxRealPoint operator -(const wxRealPoint& pt, const wxSize& sz);
+    wxRealPoint operator +(const wxSize& sz, const wxRealPoint& pt);
+    wxRealPoint operator -(const wxSize& sz, const wxRealPoint& pt);
+
+    wxRealPoint& operator +=(const wxSize& sz);
+    wxRealPoint& operator -=(const wxSize& sz);
+
+    wxSize operator /(const wxRealPoint& sz, int factor);
+    wxSize operator *(const wxRealPoint& sz, int factor);
+    wxSize operator *(int factor, const wxSize& sz);
+    wxSize& operator /=(int factor);
+    wxSize& operator *=(int factor);
+    //@}
+
     /**
         X coordinate of this point.
     */
@@ -155,8 +197,8 @@ public:
 
     A class for manipulating rectangles.
 
-    Note that the x, y coordinates and the width and height stored inside a wxRect 
-    object may be negative and that wxRect functions do not perform any check against 
+    Note that the x, y coordinates and the width and height stored inside a wxRect
+    object may be negative and that wxRect functions do not perform any check against
     negative values.
 
     @library{wxcore}
@@ -469,7 +511,7 @@ public:
 
     A wxPoint is a useful data structure for graphics operations.
 
-    It contains integer @e x and @e y members. 
+    It contains integer @e x and @e y members.
     See wxRealPoint for a floating point version.
 
     Note that the width and height stored inside a wxPoint object may be negative
@@ -492,15 +534,21 @@ public:
         Initializes the internal x and y coordinates to zero.
     */
     wxPoint();
-    
+
     /**
         Initializes the point object with the given @a x and @a y coordinates.
     */
     wxPoint(int x, int y);
 
+    /**
+        Converts the given wxRealPoint (with floating point coordinates) to a
+        wxPoint instance.
+    */
+    wxPoint(const wxRealPoint& pt);
+
     /**
         @name Miscellaneous operators
-        
+
         Note that these operators are documented as class members
         (to make them easier to find) but, as their prototype shows,
         they are implemented as global operators; note that this is
@@ -527,14 +575,14 @@ public:
 
     wxPoint& operator +=(const wxSize& sz);
     wxPoint& operator -=(const wxSize& sz);
-    
+
     wxSize operator /(const wxPoint& sz, int factor);
     wxSize operator *(const wxPoint& sz, int factor);
     wxSize operator *(int factor, const wxSize& sz);
     wxSize& operator /=(int factor);
     wxSize& operator *=(int factor);
     //@}
-    
+
     /**
         x member.
     */
@@ -676,12 +724,18 @@ public:
 };
 
 
+/**
+    Global istance of a wxColourDatabase.
+*/
+wxColourDatabase* wxTheColourDatabase;
+
+
 /**
     @class wxSize
 
-    A wxSize is a useful data structure for graphics operations. 
+    A wxSize is a useful data structure for graphics operations.
     It simply contains integer @e width and @e height members.
-    
+
     Note that the width and height stored inside a wxSize object may be negative
     and that wxSize functions do not perform any check against negative values
     (this is used to e.g. store the special -1 value in ::wxDefaultSize instance).
@@ -712,7 +766,7 @@ public:
         Initializes this size object with zero width and height.
     */
     wxSize();
-    
+
     /**
         Initializes this size object with the given @a width and @a height.
     */
@@ -724,6 +778,7 @@ public:
 
         @see IncBy()
     */
+    void DecBy(const wxPoint& pt);
     void DecBy(const wxSize& size);
     void DecBy(int dx, int dy);
     void DecBy(int d);
@@ -753,6 +808,7 @@ public:
 
         @see DecBy()
     */
+    void IncBy(const wxPoint& pt);
     void IncBy(const wxSize& size);
     void IncBy(int dx, int dy);
     void IncBy(int d);
@@ -816,10 +872,10 @@ public:
     */
     void SetWidth(int width);
 
-    
+
     /**
         @name Miscellaneous operators
-        
+
         Note that these operators are documented as class members
         (to make them easier to find) but, as their prototype shows,
         they are implemented as global operators; note that this is