add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

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

diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h
index 8a72f9352dcf1123c48d44a22a31989bf9293dab..b06c7a331eedba52e5bf29fa4e718a7e57fbc8a4 100644 (file)
--- a/interface/wx/gdicmn.h
+++ b/interface/wx/gdicmn.h
@@ -311,14 +311,19 @@ public:
     wxRect Inflate(wxCoord dx, wxCoord dy) const;
     //@}
 
     wxRect Inflate(wxCoord dx, wxCoord dy) const;
     //@}
 

-    //@{

     /**
     /**

-        Modifies the rectangle to contain the overlapping box of this rectangle
+        Modifies this rectangle to contain the overlapping portion of this rectangle

         and the one passed in as parameter.
         and the one passed in as parameter.

+
+        @return This rectangle, modified.

     */
     */

-    wxRect Intersect(const wxRect& rect) const;

     wxRect& Intersect(const wxRect& rect);
     wxRect& Intersect(const wxRect& rect);

-    //@}
+
+    /**
+        Returns the overlapping portion of this rectangle and the one passed in as
+        parameter.
+    */
+    wxRect Intersect(const wxRect& rect) const;

 
     /**
         Returns @true if this rectangle has a non-empty intersection with the
 
     /**
         Returns @true if this rectangle has a non-empty intersection with the


@@ -402,7 +407,7 @@ public:
     /**
         Assignment operator.
     */
     /**
         Assignment operator.
     */

-    void operator =(const wxRect& rect);
+    wxRect& operator=(const wxRect& rect);

 
     /**
         Equality operator.
 
     /**
         Equality operator.


@@ -462,7 +467,7 @@ public:
     /**
         Assignment operator.
     */
     /**
         Assignment operator.
     */

-    void operator =(const wxPoint& pt);
+    wxPoint& operator=(const wxPoint& pt);

 
     bool operator ==(const wxPoint& p1, const wxPoint& p2);
     bool operator !=(const wxPoint& p1, const wxPoint& p2);
 
     bool operator ==(const wxPoint& p1, const wxPoint& p2);
     bool operator !=(const wxPoint& p1, const wxPoint& p2);


@@ -612,7 +617,7 @@ public:
         is, wxColour::IsOk() will return @false) if the colour wasn't found in
         the database.
     */
         is, wxColour::IsOk() will return @false) if the colour wasn't found in
         the database.
     */

-    wxColour Find(const wxString& colourName);
+    wxColour Find(const wxString& colourName) const;

 
     /**
         Finds a colour name given the colour. Returns an empty string if the
 
     /**
         Finds a colour name given the colour. Returns an empty string if the


@@ -757,7 +762,7 @@ public:
     /**
         Assignment operator.
     */
     /**
         Assignment operator.
     */

-    void operator =(const wxSize& sz);
+    wxSize& operator=(const wxSize& sz);

 
     bool operator ==(const wxSize& s1, const wxSize& s2);
     bool operator !=(const wxSize& s1, const wxSize& s2);
 
     bool operator ==(const wxSize& s1, const wxSize& s2);
     bool operator !=(const wxSize& s1, const wxSize& s2);