X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f61757b17c623137d439b3cbe34960f7ce1e9601..319fefa9109ef95cab9f6dcbd46e3f3edbcff8c9:/include/wx/gdicmn.h?ds=sidebyside diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 32569e0a49..78d36bd920 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -100,6 +100,9 @@ enum wxStockCursor wxCURSOR_WAIT, wxCURSOR_WATCH, wxCURSOR_BLANK, +#ifdef __WXGTK__ + wxCURSOR_DEFAULT, // standard X11 cursor +#endif #ifdef __X__ // Not yet implemented for Windows wxCURSOR_CROSS_REVERSE, @@ -149,7 +152,9 @@ enum wxStockCursor class WXDLLEXPORT wxSize { public: - // members are public for compatibility + // members are public for compatibility (don't use them directly, + // especially that there names were chosen very unfortunately - they should + // have been called width and height) long x; long y; @@ -158,15 +163,21 @@ public: wxSize(long xx, long yy) { Set(xx, yy); } // no copy ctor or assignment operator - the defaults are ok - bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; } // FIXME are these really useful? If they're, we should have += &c as well wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); } wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); } + // accessors void Set(long xx, long yy) { x = xx; y = yy; } + void SetWidth(long w) { x = w; } + void SetHeight(long h) { y = h; } + + long GetWidth() const { return x; } + long GetHeight() const { return y; } + // compatibility long GetX() const { return x; } long GetY() const { return y; } };