X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae53c98c9f71acb0876846b9c5b1e56adfdb6186..c25a510b30bd87f26deaf3532a48d29a158f0aea:/include/wx/gdicmn.h?ds=sidebyside

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 78d36bd920..c392d75df6 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
 };
 
@@ -131,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 )
@@ -142,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__) || defined(__WXMOTIF__)
+    // Initialize from an included XPM
+    #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
+#else // other platforms
+    #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
+#endif // platform
+
 // ===========================================================================
 // classes
 // ===========================================================================
@@ -155,12 +183,11 @@ public:
     // 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;
+    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; }
@@ -170,16 +197,16 @@ public:
     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; }
+    void Set(int xx, int yy) { x = xx; y = yy; }
+    void SetWidth(int w) { x = w; }
+    void SetHeight(int h) { y = h; }
 
-    long GetWidth() const { return x; }
-    long GetHeight() const { return y; }
+    int GetWidth() const { return x; }
+    int GetHeight() const { return y; }
 
     // compatibility
-    long GetX() const { return x; }
-    long GetY() const { return y; }
+    int GetX() const { return x; }
+    int GetY() const { return y; }
 };
 
 // ---------------------------------------------------------------------------
@@ -204,16 +231,10 @@ 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
 
@@ -242,33 +263,39 @@ class WXDLLEXPORT wxRect
 {
 public:
     wxRect() { x = y = width = height = 0; }
-    wxRect(long xx, long yy, long ww, long hh)
+    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);
 
     // default copy ctor and assignment operators ok
 
-    long GetX() const { return x; }
-    void SetX(long xx) { x = xx; }
+    int GetX() const { return x; }
+    void SetX(int xx) { x = xx; }
 
-    long GetY() const { return y; }
-    void SetY(long yy) { y = yy; }
+    int GetY() const { return y; }
+    void SetY(int yy) { y = yy; }
 
-    long GetWidth() const { return width; }
-    void SetWidth(long w) { width = w; }
+    int GetWidth() const { return width; }
+    void SetWidth(int w) { width = w; }
 
-    long GetHeight() const { return height; }
-    void SetHeight(long h) { height = h; }
+    int GetHeight() const { return height; }
+    void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }
     wxSize GetSize() const { return wxSize(width, height); }
 
-    long GetLeft()   const { return x; }
-    long GetTop()    const { return y; }
-    long GetBottom() const { return y + height; }
-    long GetRight()  const { return x + width; }
+    // MFC-like functions
 
+    int GetLeft()   const { return x; }
+    int GetTop()    const { return y; }
+    int GetBottom() const { return y + height - 1; }
+    int GetRight()  const { return x + width - 1; }
+
+    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; }
 
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
@@ -276,9 +303,9 @@ public:
     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;
 };
 
 // ---------------------------------------------------------------------------
@@ -325,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