X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/764a3a49068a94d1edb96f299b10c155d101c1b0..efba2b89f15ba8757a722fc56c67f434cf960482:/include/wx/gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index b742531d92..b787855e72 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -68,6 +68,10 @@ 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_ANY = 50
 };
 
@@ -100,6 +104,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 +135,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 +149,16 @@ 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)
+#else // !(Windows || OS2)
+    #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
+#endif // platform
+
 // ===========================================================================
 // classes
 // ===========================================================================
@@ -149,7 +169,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 +180,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; }
 };
@@ -250,17 +278,28 @@ public:
     long GetHeight() const { return height; }
     void SetHeight(long h) { height = h; }
 
-    wxPoint GetPosition() { return wxPoint(x, y); }
-    wxSize GetSize() { return wxSize(width, height); }
+    wxPoint GetPosition() const { return wxPoint(x, y); }
+    wxSize GetSize() const { return wxSize(width, height); }
+
+    // MFC-like functions
 
     long GetLeft()   const { return x; }
     long GetTop()    const { return y; }
-    long GetBottom() const { return y + height; }
-    long GetRight()  const { return x + width; }
+    long GetBottom() const { return y + height - 1; }
+    long GetRight()  const { return x + width - 1; }
+
+    void SetLeft(long left) { x = left; }
+    void SetRight(long right) { width = right - x + 1; }
+    void SetTop(long top) { y = top; }
+    void SetBottom(long bottom) { height = bottom - y + 1; }
 
     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);
+    
 public:
     long x, y, width, height;
 };