X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea804aadf91c963d97a56e152d8372c9e689affe..bd73863347c81c1b41b3a7684f0219d44d1c53d2:/include/wx/gdicmn.h?ds=sidebyside diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 6ec9156556..ed81546eec 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -26,6 +26,7 @@ #include "wx/string.h" #include "wx/setup.h" #include "wx/colour.h" +#include "wx/font.h" // --------------------------------------------------------------------------- // forward declarations @@ -49,7 +50,8 @@ class WXDLLEXPORT wxString; // Bitmap flags enum { - wxBITMAP_TYPE_BMP = 1, + wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility! + wxBITMAP_TYPE_BMP, wxBITMAP_TYPE_BMP_RESOURCE, wxBITMAP_TYPE_RESOURCE = wxBITMAP_TYPE_BMP_RESOURCE, wxBITMAP_TYPE_ICO, @@ -68,6 +70,16 @@ enum wxBITMAP_TYPE_PNG_RESOURCE, wxBITMAP_TYPE_JPEG, wxBITMAP_TYPE_JPEG_RESOURCE, + wxBITMAP_TYPE_PNM, + wxBITMAP_TYPE_PNM_RESOURCE, + wxBITMAP_TYPE_PCX, + wxBITMAP_TYPE_PCX_RESOURCE, + wxBITMAP_TYPE_PICT, + wxBITMAP_TYPE_PICT_RESOURCE, + wxBITMAP_TYPE_ICON, + wxBITMAP_TYPE_ICON_RESOURCE, + wxBITMAP_TYPE_MACCURSOR, + wxBITMAP_TYPE_MACCURSOR_RESOURCE, wxBITMAP_TYPE_ANY = 50 }; @@ -100,6 +112,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, @@ -128,6 +143,9 @@ enum wxStockCursor #ifdef __WXMSW__ // Load from a resource #define wxICON(X) wxIcon("" #X "") +#elif defined(__WXPM__) + // Load from a resource + #define wxICON(X) wxIcon("" #X "") #elif defined(__WXGTK__) // Initialize from an included XPM #define wxICON(X) wxIcon( (const char**) X##_xpm ) @@ -139,6 +157,19 @@ enum wxStockCursor #define wxICON(X) wxIcon("" #X "") #endif // platform +/* Another macro: this one is for portable creation of bitmaps. We assume that + under Unix bitmaps live in XPMs and under Windows they're in ressources. + */ + +#if defined(__WXMSW__) || defined(__WXPM__) + #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE) +#elif defined(__WXGTK__) + // Initialize from an included XPM + #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm ) +#else // !(Windows || OS2) + #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM) +#endif // platform + // =========================================================================== // classes // =========================================================================== @@ -149,31 +180,39 @@ enum wxStockCursor class WXDLLEXPORT wxSize { public: - // members are public for compatibility - long x; - long y; + // 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) + int x, y; // constructors wxSize() { x = y = 0; } - wxSize(long xx, long yy) { Set(xx, yy); } + wxSize(int xx, int 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); } - void Set(long xx, long yy) { x = xx; y = yy; } + // accessors + void Set(int xx, int yy) { x = xx; y = yy; } + void SetWidth(int w) { x = w; } + void SetHeight(int h) { y = h; } - long GetX() const { return x; } - long GetY() const { return y; } + int GetWidth() const { return x; } + int GetHeight() const { return y; } + + // compatibility + int GetX() const { return x; } + int GetY() const { return y; } }; // --------------------------------------------------------------------------- // Point classes: with real or integer coordinates // --------------------------------------------------------------------------- + class WXDLLEXPORT wxRealPoint { public: @@ -192,23 +231,23 @@ public: class WXDLLEXPORT wxPoint { public: -#if defined(__WXMSW__) && !defined(__WIN32__) - int x; - int y; -#else - long x; - long y; -#endif + int x, y; wxPoint() { x = y = 0; }; - wxPoint(long xx, long yy) { x = xx; y = yy; }; + wxPoint(int xx, int yy) { x = xx; y = yy; }; // no copy ctor or assignment operator - the defaults are ok - bool operator==(const wxPoint& pt) const { return x == pt.x && y == pt.y; } + // comparison + bool operator==(const wxPoint& p) const { return x == p.x && y == p.y; } + bool operator!=(const wxPoint& p) const { return !(*this == p); } + + // arithmetic operations (component wise) + wxPoint operator+(const wxPoint& p) { return wxPoint(x + p.x, y + p.y); } + wxPoint operator-(const wxPoint& p) { return wxPoint(x - p.x, y - p.y); } - wxPoint operator + (const wxPoint& pt) { return wxPoint(x + pt.x, y + pt.y); } - wxPoint operator - (const wxPoint& pt) { return wxPoint(x - pt.x, y - pt.y); } + wxPoint& operator+=(const wxPoint& p) { x += p.x; y += p.y; return *this; } + wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; } }; #if WXWIN_COMPATIBILITY @@ -223,38 +262,50 @@ public: class WXDLLEXPORT wxRect { public: - wxRect(); - wxRect(long x, long y, long w, long h); + wxRect() { x = y = width = height = 0; } + wxRect(int xx, int yy, int ww, int hh) + { x = xx; y = yy; width = ww; height = hh; } wxRect(const wxPoint& topLeft, const wxPoint& bottomRight); wxRect(const wxPoint& pos, const wxSize& size); - wxRect(const wxRect& rect); - long GetX() const { return x; } - void SetX(long xx) { x = xx; } + // default copy ctor and assignment operators ok + + int GetX() const { return x; } + void SetX(int xx) { x = xx; } + + int GetY() const { return y; } + void SetY(int yy) { y = yy; } + + int GetWidth() const { return width; } + void SetWidth(int w) { width = w; } + + int GetHeight() const { return height; } + void SetHeight(int h) { height = h; } - long GetY() const { return y; } - void SetY(long yy) { y = yy; } + wxPoint GetPosition() const { return wxPoint(x, y); } + wxSize GetSize() const { return wxSize(width, height); } - long GetWidth() const { return width; } - void SetWidth(long w) { width = w; } + // MFC-like functions - long GetHeight() const { return height; } - void SetHeight(long h) { height = h; } + int GetLeft() const { return x; } + int GetTop() const { return y; } + int GetBottom() const { return y + height - 1; } + int GetRight() const { return x + width - 1; } - wxPoint GetPosition() { return wxPoint(x, y); } - wxSize GetSize() { return wxSize(width, height); } + void SetLeft(int left) { x = left; } + void SetRight(int right) { width = right - x + 1; } + void SetTop(int top) { y = top; } + void SetBottom(int bottom) { height = bottom - y + 1; } - long GetLeft() const { return x; } - long GetTop() const { return y; } - long GetBottom() const { return y + height; } - long GetRight() const { return x + width; } + bool operator==(const wxRect& rect) const; + bool operator!=(const wxRect& rect) const { return !(*this == rect); } - wxRect& operator = (const wxRect& rect); - bool operator == (const wxRect& rect); - bool operator != (const wxRect& rect); + bool Inside(int cx, int cy) const; + wxRect operator + (const wxRect& rect) const; + const wxRect& operator += (const wxRect& rect); public: - long x, y, width, height; + int x, y, width, height; }; // --------------------------------------------------------------------------- @@ -301,7 +352,8 @@ public: void RemoveFont(wxFont *font); wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight, bool underline = FALSE, - const wxString& face = wxEmptyString); + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); }; class WXDLLEXPORT wxColourDatabase : public wxList