wxMSWUniv wxWindowMSW vs. wxWindow fix.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 5923c48fbfa2417983877678c6942280cd4df223..10e7b6b5ee7b10395f5d5b014cc6a16109d39075 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -16,39 +16,37 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "gdicmn.h"
 #endif
 
     #pragma interface "gdicmn.h"
 #endif
 

-#include "wx/object.h"
+#include "wx/setup.h"

 #include "wx/list.h"
 #include "wx/list.h"

-#include "wx/hash.h"

 #include "wx/string.h"
 #include "wx/string.h"

-#include "wx/setup.h"
-#include "wx/colour.h"
-#include "wx/font.h"
+#include "wx/fontenc.h"
+#include "wx/hashmap.h"

 
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBrush;
-class WXDLLEXPORT wxColour;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxPalette;
-class WXDLLEXPORT wxPen;
-class WXDLLEXPORT wxRegion;
-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxBrush;
+class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_CORE wxCursor;
+class WXDLLIMPEXP_CORE wxFont;
+class WXDLLIMPEXP_CORE wxIcon;
+class WXDLLIMPEXP_CORE wxPalette;
+class WXDLLIMPEXP_CORE wxPen;
+class WXDLLIMPEXP_CORE wxRegion;
+class WXDLLIMPEXP_BASE wxString;

 
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 
 // Bitmap flags
 
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 
 // Bitmap flags

-enum
+enum wxBitmapType

 {
     wxBITMAP_TYPE_INVALID,          // should be == 0 for compatibility!
     wxBITMAP_TYPE_BMP,
 {
     wxBITMAP_TYPE_INVALID,          // should be == 0 for compatibility!
     wxBITMAP_TYPE_BMP,


@@ -78,6 +76,8 @@ enum
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,

+    wxBITMAP_TYPE_ANI,
+    wxBITMAP_TYPE_IFF,

     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50
     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50


@@ -88,6 +88,7 @@ enum wxStockCursor
 {
     wxCURSOR_NONE,          // should be 0
     wxCURSOR_ARROW,
 {
     wxCURSOR_NONE,          // should be 0
     wxCURSOR_ARROW,

+    wxCURSOR_RIGHT_ARROW,

     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,
     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,


@@ -115,6 +116,9 @@ enum wxStockCursor
 #ifdef __WXGTK__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif
 #ifdef __WXGTK__
     wxCURSOR_DEFAULT, // standard X11 cursor
 #endif

+#ifdef __WXMAC__
+    wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow
+#endif

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


@@ -123,9 +127,15 @@ enum wxStockCursor
     wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11
 
     wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11
 

+    wxCURSOR_ARROWWAIT,
+

     wxCURSOR_MAX
 };
 
     wxCURSOR_MAX
 };
 

+#ifndef __WXGTK__
+    #define wxCURSOR_DEFAULT wxCURSOR_ARROW
+#endif
+

 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------


@@ -142,19 +152,28 @@ enum wxStockCursor
 
 #ifdef __WXMSW__
     // Load from a resource
 
 #ifdef __WXMSW__
     // Load from a resource

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #elif defined(__WXPM__)
     // Load from a resource
 #elif defined(__WXPM__)
     // Load from a resource

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))
+#elif defined(__WXMGL__)
+    // 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 )
 #elif defined(__WXGTK__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( (const char**) X##_xpm )

+#elif defined(__WXMAC__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )

 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )

+#elif defined(__WXX11__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( X##_xpm )

 #else
     // This will usually mean something on any platform
 #else
     // This will usually mean something on any platform

-    #define wxICON(X) wxIcon("" #X "")
+    #define wxICON(X) wxIcon(wxT(#X))

 #endif // platform
 
 /* Another macro: this one is for portable creation of bitmaps. We assume that
 #endif // platform
 
 /* Another macro: this one is for portable creation of bitmaps. We assume that


@@ -162,8 +181,13 @@ enum wxStockCursor
  */
 
 #if defined(__WXMSW__) || defined(__WXPM__)
  */
 
 #if defined(__WXMSW__) || defined(__WXPM__)

-    #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+    #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
+#elif defined(__WXGTK__)   || \
+      defined(__WXMOTIF__) || \
+      defined(__WXX11__)   || \
+      defined(__WXMAC__)   || \
+      defined(__WXMGL__)   || \
+      defined(__WXCOCOA__)

     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms
     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms


@@ -177,24 +201,36 @@ enum wxStockCursor
 // ---------------------------------------------------------------------------
 // wxSize
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxSize
 // ---------------------------------------------------------------------------

+

 class WXDLLEXPORT wxSize
 {
 public:
 class WXDLLEXPORT wxSize
 {
 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)
+    // members are public for compatibility, don't use them directly.

     int x, y;
 
     // constructors
     int x, y;
 
     // constructors

-    wxSize() { x = y = 0; }
-    wxSize(int xx, int yy) { Set(xx, yy); }
+    wxSize() : x(0), y(0) { }
+    wxSize(int xx, int yy) : x(xx), y(yy) { }

 
     // no copy ctor or assignment operator - the defaults are ok
 
     // no copy ctor or assignment operator - the defaults are ok

+

     bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }
     bool operator==(const wxSize& sz) const { return 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); }
     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); }

+    wxSize operator/(const int i) { return wxSize(x / i, y / i); }
+    wxSize operator*(const int i) { return wxSize(x * i, y * i); }
+
+    wxSize& operator+=(const wxSize& sz) { x += sz.x; y += sz.y; return *this; }
+    wxSize& operator-=(const wxSize& sz) { x -= sz.x; y -= sz.y; return *this; }
+    wxSize& operator/=(const int i) { x /= i; y /= i; return *this; }
+    wxSize& operator*=(const int i) { x *= i; y *= i; return *this; }
+
+    void IncTo(const wxSize& sz)
+        { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
+    void DecTo(const wxSize& sz)
+        { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; }

 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }


@@ -204,6 +240,18 @@ public:
     int GetWidth() const { return x; }
     int GetHeight() const { return y; }
 
     int GetWidth() const { return x; }
     int GetHeight() const { return y; }
 

+    bool IsFullySpecified() const { return x != wxDefaultCoord && y != wxDefaultCoord; }
+
+    // combine this size with the other one replacing the default (i.e. equal
+    // to wxDefaultCoord) components of this object with those of the other
+    void SetDefaults(const wxSize& size)
+    {
+        if ( x == wxDefaultCoord )
+            x = size.x;
+        if ( y == wxDefaultCoord )
+            y = size.y;
+    }
+

     // compatibility
     int GetX() const { return x; }
     int GetY() const { return y; }
     // compatibility
     int GetX() const { return x; }
     int GetY() const { return y; }


@@ -219,13 +267,14 @@ public:
     double x;
     double y;
 
     double x;
     double y;
 

-    wxRealPoint() { x = y = 0.0; };
-    wxRealPoint(double xx, double yy) { x = xx; y = yy; };
+    wxRealPoint() : x(0.0), y(0.0) { }
+    wxRealPoint(double xx, double yy) : x(xx), y(yy) { }

 
 

-    wxRealPoint operator+(const wxRealPoint& pt) { return wxRealPoint(x + pt.x, y + pt.y); }
-    wxRealPoint operator-(const wxRealPoint& pt) { return wxRealPoint(x - pt.x, y - pt.y); }
+    wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
+    wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }

 
     bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }
 
     bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }

+    bool operator!=(const wxRealPoint& pt) const { return x != pt.x || y != pt.y; }

 };
 
 class WXDLLEXPORT wxPoint
 };
 
 class WXDLLEXPORT wxPoint


@@ -233,8 +282,8 @@ class WXDLLEXPORT wxPoint
 public:
     int x, y;
 
 public:
     int x, y;
 

-    wxPoint() { x = y = 0; };
-    wxPoint(int xx, int yy) { x = xx; y = yy; };
+    wxPoint() : x(0), y(0) { }
+    wxPoint(int xx, int yy) : x(xx), y(yy) { }

 
     // no copy ctor or assignment operator - the defaults are ok
 
 
     // no copy ctor or assignment operator - the defaults are ok
 


@@ -243,17 +292,18 @@ public:
     bool operator!=(const wxPoint& p) const { return !(*this == p); }
 
     // arithmetic operations (component wise)
     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& p) const { return wxPoint(x + p.x, y + p.y); }
+    wxPoint operator-(const wxPoint& p) const { return wxPoint(x - p.x, y - p.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; }
 
     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
-    #define wxIntPoint wxPoint
-    #define wxRectangle wxRect
-#endif // WXWIN_COMPATIBILITY
+    wxPoint& operator+=(const wxSize& s) { x += s.GetWidth(); y += s.GetHeight(); return *this; }
+    wxPoint& operator-=(const wxSize& s) { x -= s.GetWidth(); y -= s.GetHeight(); return *this; }
+
+    wxPoint operator+(const wxSize& s) const { return wxPoint(x + s.GetWidth(), y + s.GetHeight()); }
+    wxPoint operator-(const wxSize& s) const { return wxPoint(x - s.GetWidth(), y - s.GetHeight()); }
+};

 
 // ---------------------------------------------------------------------------
 // wxRect
 
 // ---------------------------------------------------------------------------
 // wxRect


@@ -262,11 +312,19 @@ public:
 class WXDLLEXPORT wxRect
 {
 public:
 class WXDLLEXPORT wxRect
 {
 public:

-    wxRect() { x = y = width = height = 0; }
+    wxRect()
+        : x(0), y(0), width(0), height(0)
+        { }

     wxRect(int xx, int yy, int ww, int hh)
     wxRect(int xx, int yy, int ww, int hh)

-        { x = xx; y = yy; width = ww; height = hh; }
+        : x(xx), y(yy), width(ww), height(hh)
+        { }

     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);

-    wxRect(const wxPoint& pos, const wxSize& size);
+    wxRect(const wxPoint& pt, const wxSize& size)
+        : x(pt.x), y(pt.y), width(size.x), height(size.y)
+        { }
+    wxRect(const wxSize& size)
+        : x(0), y(0), width(size.x), height(size.y)
+        { }

 
     // default copy ctor and assignment operators ok
 
 
     // default copy ctor and assignment operators ok
 


@@ -283,7 +341,20 @@ public:
     void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }
     void SetHeight(int h) { height = h; }
 
     wxPoint GetPosition() const { return wxPoint(x, y); }

+    void SetPosition( const wxPoint &p ) { x = p.x; y = p.y; }
+

     wxSize GetSize() const { return wxSize(width, height); }
     wxSize GetSize() const { return wxSize(width, height); }

+    void SetSize( const wxSize &s ) { width = s.GetWidth(); height = s.GetHeight(); }
+
+    wxPoint GetTopLeft() const { return GetPosition(); }
+    wxPoint GetLeftTop() const { return GetTopLeft(); }
+    void SetTopLeft(const wxPoint &p) { SetPosition(p); }
+    void SetLeftTop(const wxPoint &p) { SetTopLeft(p); }
+
+    wxPoint GetBottomRight() const { return wxPoint(GetRight(), GetBottom()); }
+    wxPoint GetRightBottom() const { return GetBottomRight(); }
+    void SetBottomRight(const wxPoint &p) { SetRight(p.x); SetBottom(p.y); }
+    void SetRightBottom(const wxPoint &p) { SetBottomRight(p); }

 
     int GetLeft()   const { return x; }
     int GetTop()    const { return y; }
 
     int GetLeft()   const { return x; }
     int GetTop()    const { return y; }


@@ -295,22 +366,64 @@ public:
     void SetTop(int top) { y = top; }
     void SetBottom(int bottom) { height = bottom - y + 1; }
 
     void SetTop(int top) { y = top; }
     void SetBottom(int bottom) { height = bottom - y + 1; }
 

-    void Inflate(wxCoord dx, wxCoord dy)
+    // operations with rect
+    wxRect& Inflate(wxCoord dx, wxCoord dy);
+    wxRect& Inflate(wxCoord d) { return Inflate(d, d); }
+    wxRect Inflate(wxCoord dx, wxCoord dy) const

     {
     {

-        x -= dx;
-        y -= dy;
-        width += 2*dx;
-        height += 2*dy;
+        wxRect r = *this;
+        r.Inflate(dx, dy);
+        return r;

     }
 
     }
 

-    void Inflate(wxCoord d) { Inflate(d, d); }
+    wxRect& Deflate(wxCoord dx, wxCoord dy) { return Inflate(-dx, -dy); }
+    wxRect& Deflate(wxCoord d) { return Inflate(-d); }
+    wxRect Deflate(wxCoord dx, wxCoord dy) const
+    {
+        wxRect r = *this;
+        r.Deflate(dx, dy);
+        return r;
+    }

 
 

+    void Offset(wxCoord dx, wxCoord dy) { x += dx; y += dy; }
+    void Offset(const wxPoint& pt) { Offset(pt.x, pt.y); }
+
+    wxRect& Intersect(const wxRect& rect);
+    wxRect Intersect(const wxRect& rect) const
+    {
+        wxRect r = *this;
+        r.Intersect(rect);
+        return r;
+    }
+
+    wxRect& Union(const wxRect& rect);
+    wxRect Union(const wxRect& rect) const
+    {
+        wxRect r = *this;
+        r.Union(rect);
+        return r;
+    }
+
+    // compare rectangles

     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 
     bool operator==(const wxRect& rect) const;
     bool operator!=(const wxRect& rect) const { return !(*this == rect); }
 

-    bool Inside(int cx, int cy) const;
+    // return true if the point is (not strcitly) inside the rect
+    bool Inside(int x, int y) const;
+    bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
+
+    // return true if the rectangles have a non empty intersection
+    bool Intersects(const wxRect& rect) const;
+
+
+    // these are like Union() but don't ignore empty rectangles

     wxRect operator+(const wxRect& rect) const;
     wxRect operator+(const wxRect& rect) const;

-    wxRect& operator+=(const wxRect& rect);
+    wxRect& operator+=(const wxRect& rect)
+    {
+        *this = *this + rect;
+        return *this;
+    }
+

 
 public:
     int x, y, width, height;
 
 public:
     int x, y, width, height;


@@ -320,10 +433,10 @@ public:
 // Management of pens, brushes and fonts
 // ---------------------------------------------------------------------------
 
 // Management of pens, brushes and fonts
 // ---------------------------------------------------------------------------
 

+typedef wxInt8 wxDash;
+

 class WXDLLEXPORT wxPenList : public wxList
 {
 class WXDLLEXPORT wxPenList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxPenList)
-

 public:
     wxPenList() { }
     ~wxPenList();
 public:
     wxPenList() { }
     ~wxPenList();


@@ -335,8 +448,6 @@ public:
 
 class WXDLLEXPORT wxBrushList : public wxList
 {
 
 class WXDLLEXPORT wxBrushList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxBrushList)
-

 public:
     wxBrushList() { }
     ~wxBrushList();
 public:
     wxBrushList() { }
     ~wxBrushList();


@@ -346,12 +457,8 @@ public:
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
 };
 
     wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
 };
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-

 class WXDLLEXPORT wxFontList : public wxList
 {
 class WXDLLEXPORT wxFontList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxFontList)
-

 public:
     wxFontList() { }
     ~wxFontList();
 public:
     wxFontList() { }
     ~wxFontList();


@@ -359,31 +466,48 @@ public:
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,

-                             bool underline = FALSE,
+                             bool underline = false,

                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 
                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 

-class WXDLLEXPORT wxColourDatabase : public wxList
-{
-    DECLARE_CLASS(wxColourDatabase)
+WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );

 
 

+class WXDLLEXPORT wxColourDatabase
+{

 public:
 public:

-    wxColourDatabase(int type);
-    ~wxColourDatabase() ;
+    wxColourDatabase();
+    ~wxColourDatabase();

 
 

-    // Not const because it may add a name to the database
-    wxColour *FindColour(const wxString& colour) ;
+    // find colour by name or name for the given colour
+    wxColour Find(const wxString& name) const;

     wxString FindName(const wxColour& colour) const;
     wxString FindName(const wxColour& colour) const;

+
+    // add a new colour to the database
+    void AddColour(const wxString& name, const wxColour& colour);
+
+    // deprecated, use Find() instead
+    wxDEPRECATED( wxColour *FindColour(const wxString& name) );
+
+
+#ifdef __WXPM__
+    // PM keeps its own type of colour table
+    long*                           m_palTable;
+    size_t                          m_nSize;
+#endif
+
+private:
+    // load the database with the built in colour values when called for the
+    // first time, do nothing after this

     void Initialize();
     void Initialize();

+
+    wxStringToColourHashMap *m_map;

 };
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {
 };
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {

-    DECLARE_DYNAMIC_CLASS(wxBitmapList)
-

 public:
 public:

-    wxBitmapList();
+    wxBitmapList(){}

     ~wxBitmapList();
 
     void AddBitmap(wxBitmap *bitmap);
     ~wxBitmapList();
 
     void AddBitmap(wxBitmap *bitmap);


@@ -394,11 +518,10 @@ class WXDLLEXPORT wxResourceCache: public wxList
 {
 public:
     wxResourceCache() { }
 {
 public:
     wxResourceCache() { }

+#if !wxUSE_STL

     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }

+#endif

     ~wxResourceCache();
     ~wxResourceCache();

-
-private:
-    DECLARE_DYNAMIC_CLASS(wxResourceCache)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -489,9 +612,15 @@ extern bool WXDLLEXPORT wxColourDisplay();
 extern int WXDLLEXPORT wxDisplayDepth();
 #define wxGetDisplayDepth wxDisplayDepth
 
 extern int WXDLLEXPORT wxDisplayDepth();
 #define wxGetDisplayDepth wxDisplayDepth
 

-// get the diaplay size
+// get the display size

 extern void WXDLLEXPORT wxDisplaySize(int *width, int *height);
 extern wxSize WXDLLEXPORT wxGetDisplaySize();
 extern void WXDLLEXPORT wxDisplaySize(int *width, int *height);
 extern wxSize WXDLLEXPORT wxGetDisplaySize();

+extern void WXDLLEXPORT wxDisplaySizeMM(int *width, int *height);
+extern wxSize WXDLLEXPORT wxGetDisplaySizeMM();
+
+// Get position and size of the display workarea
+extern void WXDLLEXPORT wxClientDisplayRect(int *x, int *y, int *width, int *height);
+extern wxRect WXDLLEXPORT wxGetClientDisplayRect();

 
 // set global cursor
 extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 // set global cursor
 extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);