*** empty log message ***

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 63abe6c8d12c8761da6ca1ea7016c2910a76b32d..b787855e721c7fce8ebd32d922578245e6464af4 100644 (file)
--- 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_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
 };
 
     wxBITMAP_TYPE_ANY = 50
 };
 


@@ -100,12 +104,15 @@ enum wxStockCursor
     wxCURSOR_WAIT,
     wxCURSOR_WATCH,
     wxCURSOR_BLANK,
     wxCURSOR_WAIT,
     wxCURSOR_WATCH,
     wxCURSOR_BLANK,

+#ifdef __WXGTK__
+    wxCURSOR_DEFAULT, // standard X11 cursor
+#endif

 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,
     wxCURSOR_DOUBLE_ARROW,
     wxCURSOR_BASED_ARROW_UP,
 #ifdef __X__
     // Not yet implemented for Windows
     wxCURSOR_CROSS_REVERSE,
     wxCURSOR_DOUBLE_ARROW,
     wxCURSOR_BASED_ARROW_UP,

-    wxCURSOR_BASED_ARROW_DOWN
+    wxCURSOR_BASED_ARROW_DOWN,

 #endif // X11
 
     wxCURSOR_MAX
 #endif // X11
 
     wxCURSOR_MAX


@@ -128,6 +135,9 @@ enum wxStockCursor
 #ifdef __WXMSW__
     // Load from a resource
     #define wxICON(X) wxIcon("" #X "")
 #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 )
 #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
 
     #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
 // ===========================================================================
 // ===========================================================================
 // classes
 // ===========================================================================


@@ -149,7 +169,9 @@ enum wxStockCursor
 class WXDLLEXPORT wxSize
 {
 public:
 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;
 
     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
     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); }
 
     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 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; }
 };
     long GetX() const { return x; }
     long GetY() const { return y; }
 };


@@ -174,6 +202,7 @@ public:
 // ---------------------------------------------------------------------------
 // Point classes: with real or integer coordinates
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Point classes: with real or integer coordinates
 // ---------------------------------------------------------------------------

+

 class WXDLLEXPORT wxRealPoint
 {
 public:
 class WXDLLEXPORT wxRealPoint
 {
 public:


@@ -205,10 +234,16 @@ public:
 
     // no copy ctor or assignment operator - the defaults are ok
 
 
     // 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
 };
 
 #if WXWIN_COMPATIBILITY


@@ -223,11 +258,13 @@ public:
 class WXDLLEXPORT wxRect
 {
 public:
 class WXDLLEXPORT wxRect
 {
 public:

-    wxRect();
-    wxRect(long x, long y, long w, long h);
+    wxRect() { x = y = width = height = 0; }
+    wxRect(long xx, long yy, long ww, long 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 wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& pos, const wxSize& size);

-    wxRect(const wxRect& rect);
+
+    // default copy ctor and assignment operators ok

 
     long GetX() const { return x; }
     void SetX(long xx) { x = xx; }
 
     long GetX() const { return x; }
     void SetX(long xx) { x = xx; }


@@ -241,18 +278,28 @@ public:
     long GetHeight() const { return height; }
     void SetHeight(long h) { height = h; }
 
     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 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; }

 
 

-    wxRect& operator = (const wxRect& rect);
-    bool operator == (const wxRect& rect);
-    bool operator != (const wxRect& rect);
+    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;
 };
 public:
     long x, y, width, height;
 };