X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8aa1680f21faef698d39a2bce9c09e45a5bbf7a..794bcc2dea743ac907b839f54e451847c9ea4b72:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index c392d75df6..f78f14eb95 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -126,6 +126,10 @@ enum wxStockCursor wxCURSOR_MAX }; +#ifndef __WXGTK__ + #define wxCURSOR_DEFAULT wxCURSOR_ARROW +#endif + // --------------------------------------------------------------------------- // macros // --------------------------------------------------------------------------- @@ -285,8 +289,6 @@ public: wxPoint GetPosition() const { return wxPoint(x, y); } wxSize GetSize() const { return wxSize(width, height); } - // MFC-like functions - int GetLeft() const { return x; } int GetTop() const { return y; } int GetBottom() const { return y + height - 1; } @@ -297,12 +299,22 @@ public: void SetTop(int top) { y = top; } void SetBottom(int bottom) { height = bottom - y + 1; } + void Inflate(wxCoord dx, wxCoord dy) + { + x -= dx; + y -= dy; + width += 2*dx; + height += 2*dy; + } + + void Inflate(wxCoord d) { Inflate(d, d); } + bool operator==(const wxRect& rect) const; bool operator!=(const wxRect& rect) const { return !(*this == rect); } bool Inside(int cx, int cy) const; - wxRect operator + (const wxRect& rect) const; - const wxRect& operator += (const wxRect& rect); + wxRect operator+(const wxRect& rect) const; + wxRect& operator+=(const wxRect& rect); public: int x, y, width, height;