Changed GetSize to DoGetSize so virtual GetSize works right.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 93320b4b3f1dc7db9f36632178d30e5ff5aa1a2b..32569e0a49a166b0b0a997a4c3ce65f87ffb7a6e 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -6,357 +6,448 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GDICMNH__
-#define __GDICMNH__
+#ifndef _WX_GDICMNH__
+#define _WX_GDICMNH__
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------

 
 #ifdef __GNUG__
 
 #ifdef __GNUG__

-#pragma interface "gdicmn.h"
+    #pragma interface "gdicmn.h"

 #endif
 
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/hash.h"
 #endif
 
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/hash.h"

+#include "wx/string.h"

 #include "wx/setup.h"
 #include "wx/setup.h"

+#include "wx/colour.h"

 
 

-#ifdef __WXMSW__
-#include "wx/msw/colour.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/colour.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
-#endif
+// ---------------------------------------------------------------------------
+// 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;
+
+// ---------------------------------------------------------------------------
+// constants
+// ---------------------------------------------------------------------------
+
+// Bitmap flags
+enum
+{
+    wxBITMAP_TYPE_BMP = 1,
+    wxBITMAP_TYPE_BMP_RESOURCE,
+    wxBITMAP_TYPE_RESOURCE = wxBITMAP_TYPE_BMP_RESOURCE,
+    wxBITMAP_TYPE_ICO,
+    wxBITMAP_TYPE_ICO_RESOURCE,
+    wxBITMAP_TYPE_CUR,
+    wxBITMAP_TYPE_CUR_RESOURCE,
+    wxBITMAP_TYPE_XBM,
+    wxBITMAP_TYPE_XBM_DATA,
+    wxBITMAP_TYPE_XPM,
+    wxBITMAP_TYPE_XPM_DATA,
+    wxBITMAP_TYPE_TIF,
+    wxBITMAP_TYPE_TIF_RESOURCE,
+    wxBITMAP_TYPE_GIF,
+    wxBITMAP_TYPE_GIF_RESOURCE,
+    wxBITMAP_TYPE_PNG,
+    wxBITMAP_TYPE_PNG_RESOURCE,
+    wxBITMAP_TYPE_JPEG,
+    wxBITMAP_TYPE_JPEG_RESOURCE,
+    wxBITMAP_TYPE_ANY = 50
+};

 
 // Standard cursors
 
 // Standard cursors

-typedef enum {
- wxCURSOR_ARROW =  1,
- wxCURSOR_BULLSEYE,
- wxCURSOR_CHAR,
- wxCURSOR_CROSS,
- wxCURSOR_HAND,
- wxCURSOR_IBEAM,
- wxCURSOR_LEFT_BUTTON,
- wxCURSOR_MAGNIFIER,
- wxCURSOR_MIDDLE_BUTTON,
- wxCURSOR_NO_ENTRY,
- wxCURSOR_PAINT_BRUSH,
- wxCURSOR_PENCIL,
- wxCURSOR_POINT_LEFT,
- wxCURSOR_POINT_RIGHT,
- wxCURSOR_QUESTION_ARROW,
- wxCURSOR_RIGHT_BUTTON,
- wxCURSOR_SIZENESW,
- wxCURSOR_SIZENS,
- wxCURSOR_SIZENWSE,
- wxCURSOR_SIZEWE,
- wxCURSOR_SIZING,
- wxCURSOR_SPRAYCAN,
- wxCURSOR_WAIT,
- wxCURSOR_WATCH,
- wxCURSOR_BLANK
+enum wxStockCursor
+{
+    wxCURSOR_NONE,          // should be 0
+    wxCURSOR_ARROW,
+    wxCURSOR_BULLSEYE,
+    wxCURSOR_CHAR,
+    wxCURSOR_CROSS,
+    wxCURSOR_HAND,
+    wxCURSOR_IBEAM,
+    wxCURSOR_LEFT_BUTTON,
+    wxCURSOR_MAGNIFIER,
+    wxCURSOR_MIDDLE_BUTTON,
+    wxCURSOR_NO_ENTRY,
+    wxCURSOR_PAINT_BRUSH,
+    wxCURSOR_PENCIL,
+    wxCURSOR_POINT_LEFT,
+    wxCURSOR_POINT_RIGHT,
+    wxCURSOR_QUESTION_ARROW,
+    wxCURSOR_RIGHT_BUTTON,
+    wxCURSOR_SIZENESW,
+    wxCURSOR_SIZENS,
+    wxCURSOR_SIZENWSE,
+    wxCURSOR_SIZEWE,
+    wxCURSOR_SIZING,
+    wxCURSOR_SPRAYCAN,
+    wxCURSOR_WAIT,
+    wxCURSOR_WATCH,
+    wxCURSOR_BLANK,

 #ifdef __X__
 #ifdef __X__

-  /* Not yet implemented for Windows */
-  , wxCURSOR_CROSS_REVERSE,
-  wxCURSOR_DOUBLE_ARROW,
-  wxCURSOR_BASED_ARROW_UP,
-  wxCURSOR_BASED_ARROW_DOWN
-#endif
-} _standard_cursors_t;
+    // Not yet implemented for Windows
+    wxCURSOR_CROSS_REVERSE,
+    wxCURSOR_DOUBLE_ARROW,
+    wxCURSOR_BASED_ARROW_UP,
+    wxCURSOR_BASED_ARROW_DOWN,
+#endif // X11
+
+    wxCURSOR_MAX
+};
+
+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Useful macro for creating icons portably, for example:
+
+    wxIcon *icon = new wxICON(mondrian);
+
+  expands into:
+
+    wxIcon *icon = new wxIcon("mondrian");      // On wxMSW
+    wxIcon *icon = new wxIcon(mondrian_xpm);    // On wxGTK
+ */
+
+#ifdef __WXMSW__
+    // 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(__WXMOTIF__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( X##_xpm )
+#else
+    // This will usually mean something on any platform
+    #define wxICON(X) wxIcon("" #X "")
+#endif // platform

 
 

+// ===========================================================================
+// classes
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxSize
+// ---------------------------------------------------------------------------

 class WXDLLEXPORT wxSize
 {
 public:
 class WXDLLEXPORT wxSize
 {
 public:

-  long x;
-  long y;
-  inline wxSize() { x = 0; y = 0; }
-  inline wxSize(long xx, long yy) { x = xx; y = yy; }
-  inline wxSize(const wxSize& sz) { x = sz.x; y = sz.y; }
-  inline void operator = (const wxSize& sz) { x = sz.x; y = sz.y; }
-  inline wxSize operator + (const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
-  inline wxSize operator - (const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
-  inline void Set(long xx, long yy) { x = xx; y = yy; }
-  inline long GetX() const { return x; }
-  inline long GetY() const { return y; }
+    // members are public for compatibility
+    long x;
+    long y;
+
+    // constructors
+    wxSize() { x = y = 0; }
+    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); }
+
+    void Set(long xx, long yy) { x = xx; y = yy; }
+
+    long GetX() const { return x; }
+    long GetY() const { return y; }

 };
 
 };
 

-// Point
+// ---------------------------------------------------------------------------
+// Point classes: with real or integer coordinates
+// ---------------------------------------------------------------------------
+

 class WXDLLEXPORT wxRealPoint
 {
 class WXDLLEXPORT wxRealPoint
 {

- public:
-  double x;
-  double y;
-  inline wxRealPoint() { x = 0.0; y = 0.0; };
-  inline wxRealPoint(double _x, double _y) { x = _x; y = _y; };
-  inline wxRealPoint operator + (const wxRealPoint& pt) { return wxRealPoint(x + pt.x, y + pt.y); }
-  inline wxRealPoint operator - (const wxRealPoint& pt) { return wxRealPoint(x - pt.x, y - pt.y); }
-
-  inline void operator = (const wxRealPoint& pt) { x = pt.x; y = pt.y; }
+public:
+    double x;
+    double y;
+
+    wxRealPoint() { x = 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); }
+
+    bool operator==(const wxRealPoint& pt) const { return x == pt.x && y == pt.y; }

 };
 
 class WXDLLEXPORT wxPoint
 {
 };
 
 class WXDLLEXPORT wxPoint
 {

- public:
+public:

 #if defined(__WXMSW__) && !defined(__WIN32__)
 #if defined(__WXMSW__) && !defined(__WIN32__)

-  int x;
-  int y;
+    int x;
+    int y;

 #else
 #else

-  long x;
-  long y;
+    long x;
+    long y;

 #endif
 
 #endif
 

-  inline wxPoint() { x = 0; y = 0; };
-  wxPoint(long the_x, long the_y) { x = the_x; y = the_y; };
-  wxPoint(const wxPoint& pt) { x = pt.x; y = pt.y; };
+    wxPoint() { x = y = 0; };
+    wxPoint(long xx, long yy) { x = xx; y = yy; };
+
+    // no copy ctor or assignment operator - the defaults are ok

 
 

-  inline void operator = (const wxPoint& pt) { x = pt.x; y = pt.y; }
-  inline wxPoint operator + (const wxPoint& pt) { return wxPoint(x + pt.x, y + pt.y); }
-  inline wxPoint operator - (const wxPoint& pt) { return wxPoint(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& 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

-#define wxIntPoint wxPoint
-#define wxRectangle wxRect
-#endif
+    #define wxIntPoint wxPoint
+    #define wxRectangle wxRect
+#endif // WXWIN_COMPATIBILITY
+
+// ---------------------------------------------------------------------------
+// wxRect
+// ---------------------------------------------------------------------------

 
 class WXDLLEXPORT wxRect
 {
 public:
 
 class WXDLLEXPORT wxRect
 {
 public:

-   wxRect() ;
-   wxRect(long x, long y, long w, long h);
-   wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
-   wxRect(const wxPoint& pos, const wxSize& size);
-   wxRect(const wxRect& rect);
-
-   inline long  GetX() const        { return x; }
-   inline void SetX(long X)       { x = X; }
-   inline long  GetY() const        { return y; }
-   inline void SetY(long Y)       { y = Y; }
-   inline long  GetWidth() const        { return width; }
-   inline void SetWidth(long w)   { width = w; }
-   inline long  GetHeight() const       { return height; }
-   inline void SetHeight(long h)  { height = h; }
-
-   inline wxPoint GetPosition() { return wxPoint(x, y); }
-   inline wxSize GetSize() { return wxSize(width, height); }
-
-   inline long  GetLeft()   const { return x; }
-   inline long  GetTop()    const { return y; }
-   inline long  GetBottom() const { return y + height; }
-   inline long  GetRight()  const { return x + width; }
-
-   wxRect& operator = (const wxRect& rect);
-   bool operator == (const wxRect& rect);
-   bool operator != (const wxRect& rect);
-public:
-   long x, y, width, height;
-};
+    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);

 
 

-class WXDLLEXPORT wxBrush;
-class WXDLLEXPORT wxPen;
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxPalette;
-class WXDLLEXPORT wxPalette;
+    // default copy ctor and assignment operators ok

 
 

-/*
- * Bitmap flags
- */
+    long GetX() const { return x; }
+    void SetX(long xx) { x = xx; }

 
 

-// Hint to indicate filetype
-#define wxBITMAP_TYPE_BMP               1
-#define wxBITMAP_TYPE_BMP_RESOURCE      2
-#define wxBITMAP_TYPE_ICO               3
-#define wxBITMAP_TYPE_ICO_RESOURCE      4
-#define wxBITMAP_TYPE_CUR               5
-#define wxBITMAP_TYPE_CUR_RESOURCE      6
-#define wxBITMAP_TYPE_XBM               7
-#define wxBITMAP_TYPE_XBM_DATA          8
-#define wxBITMAP_TYPE_XPM               9
-#define wxBITMAP_TYPE_XPM_DATA          10
-#define wxBITMAP_TYPE_TIF               11
-#define wxBITMAP_TYPE_TIF_RESOURCE      12
-#define wxBITMAP_TYPE_GIF               13
-#define wxBITMAP_TYPE_GIF_RESOURCE      14
-#define wxBITMAP_TYPE_PNG               15
-#define wxBITMAP_TYPE_PNG_RESOURCE      16
-#define wxBITMAP_TYPE_ANY               50
-
-#define wxBITMAP_TYPE_RESOURCE wxBITMAP_TYPE_BMP_RESOURCE
+    long GetY() const { return y; }
+    void SetY(long yy) { y = yy; }

 
 

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxIcon;
+    long GetWidth() const { return width; }
+    void SetWidth(long w) { width = w; }
+
+    long GetHeight() const { return height; }
+    void SetHeight(long 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; }
+
+
+    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;
+};
+
+// ---------------------------------------------------------------------------

 // Management of pens, brushes and fonts
 // Management of pens, brushes and fonts

-class WXDLLEXPORT wxPenList: public wxList
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPenList : public wxList

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPenList)
- public:
-  inline wxPenList()
-    { }
-  ~wxPenList();
-  void AddPen(wxPen *pen);
-  void RemovePen(wxPen *pen);
-  wxPen *FindOrCreatePen(const wxColour& colour, int width, int style);
-  wxPen *FindOrCreatePen(const wxString& colour, int width, int style);
+    DECLARE_DYNAMIC_CLASS(wxPenList)
+
+public:
+    wxPenList() { }
+    ~wxPenList();
+
+    void AddPen(wxPen *pen);
+    void RemovePen(wxPen *pen);
+    wxPen *FindOrCreatePen(const wxColour& colour, int width, int style);

 };
 
 };
 

-class WXDLLEXPORT wxBrushList: public wxList
+class WXDLLEXPORT wxBrushList : public wxList

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBrushList)
- public:
-  inline wxBrushList()
-    { }
-  ~wxBrushList();
-  void AddBrush(wxBrush *brush);
-  void RemoveBrush(wxBrush *brush);
-  wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
-  wxBrush *FindOrCreateBrush(const wxString& colour, int style);
+    DECLARE_DYNAMIC_CLASS(wxBrushList)
+
+public:
+    wxBrushList() { }
+    ~wxBrushList();
+
+    void AddBrush(wxBrush *brush);
+    void RemoveBrush(wxBrush *brush);
+    wxBrush *FindOrCreateBrush(const wxColour& colour, int style);

 };
 
 };
 

-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+
+class WXDLLEXPORT wxFontList : public wxList
+{
+    DECLARE_DYNAMIC_CLASS(wxFontList)
+
+public:
+    wxFontList() { }
+    ~wxFontList();
+
+    void AddFont(wxFont *font);
+    void RemoveFont(wxFont *font);
+    wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
+                             bool underline = FALSE,
+                             const wxString& face = wxEmptyString);
+};

 
 

-class WXDLLEXPORT wxFontList: public wxList
+class WXDLLEXPORT wxColourDatabase : public wxList

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFontList)
- public:
-  inline wxFontList()
-    { }
-  ~wxFontList();
-  void AddFont(wxFont *font);
-  void RemoveFont(wxFont *font);
-  wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
-    bool underline = FALSE, const wxString& face = wxEmptyString);
+    DECLARE_CLASS(wxColourDatabase)
+
+public:
+    wxColourDatabase(int type);
+    ~wxColourDatabase() ;
+
+    // Not const because it may add a name to the database
+    wxColour *FindColour(const wxString& colour) ;
+    wxString FindName(const wxColour& colour) const;
+    void Initialize();

 };
 
 };
 

-class WXDLLEXPORT wxColourDatabase: public wxList
+class WXDLLEXPORT wxBitmapList : public wxList

 {
 {

-  DECLARE_CLASS(wxColourDatabase)
- public:
-  wxColourDatabase(int type);
-  ~wxColourDatabase() ;
-  // Not const because it may add a name to the database
-  wxColour *FindColour(const wxString& colour) ;
-  wxString FindName(const wxColour& colour) const;
-  void Initialize();
+    DECLARE_DYNAMIC_CLASS(wxBitmapList)
+
+public:
+    wxBitmapList();
+    ~wxBitmapList();
+
+    void AddBitmap(wxBitmap *bitmap);
+    void RemoveBitmap(wxBitmap *bitmap);

 };
 
 };
 

-class WXDLLEXPORT wxBitmapList: public wxList
+class WXDLLEXPORT wxResourceCache: public wxList

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmapList)
- public:
-   wxBitmapList();
-  ~wxBitmapList();
+public:
+    wxResourceCache() { }
+    wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
+    ~wxResourceCache();

 
 

-  void AddBitmap(wxBitmap *bitmap);
-  void RemoveBitmap(wxBitmap *bitmap);
+private:
+    DECLARE_DYNAMIC_CLASS(wxResourceCache)

 };
 
 };
 

+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
+

 // Lists of GDI objects
 // Lists of GDI objects

-WXDLLEXPORT_DATA(extern wxPenList*)    wxThePenList;
-WXDLLEXPORT_DATA(extern wxBrushList*)  wxTheBrushList;
-WXDLLEXPORT_DATA(extern wxFontList*)           wxTheFontList;
-WXDLLEXPORT_DATA(extern wxBitmapList*) wxTheBitmapList;
+WXDLLEXPORT_DATA(extern wxPenList*)   wxThePenList;
+WXDLLEXPORT_DATA(extern wxBrushList*)   wxTheBrushList;
+WXDLLEXPORT_DATA(extern wxFontList*)    wxTheFontList;
+WXDLLEXPORT_DATA(extern wxBitmapList*)  wxTheBitmapList;

 
 // Stock objects
 
 // Stock objects

-WXDLLEXPORT_DATA(extern wxFont*)                       wxNORMAL_FONT;
-WXDLLEXPORT_DATA(extern wxFont*)                       wxSMALL_FONT;
-WXDLLEXPORT_DATA(extern wxFont*)                       wxITALIC_FONT;
-WXDLLEXPORT_DATA(extern wxFont*)                       wxSWISS_FONT;
-
-WXDLLEXPORT_DATA(extern wxPen*)                        wxRED_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxCYAN_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxGREEN_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxBLACK_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxWHITE_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxTRANSPARENT_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxBLACK_DASHED_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxGREY_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxMEDIUM_GREY_PEN;
-WXDLLEXPORT_DATA(extern wxPen*)                        wxLIGHT_GREY_PEN;
-
-WXDLLEXPORT_DATA(extern wxBrush*)              wxBLUE_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxGREEN_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxWHITE_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxBLACK_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxGREY_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxMEDIUM_GREY_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxLIGHT_GREY_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxTRANSPARENT_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxCYAN_BRUSH;
-WXDLLEXPORT_DATA(extern wxBrush*)              wxRED_BRUSH;
-
-WXDLLEXPORT_DATA(extern wxColour*)             wxBLACK;
-WXDLLEXPORT_DATA(extern wxColour*)             wxWHITE;
-WXDLLEXPORT_DATA(extern wxColour*)             wxRED;
-WXDLLEXPORT_DATA(extern wxColour*)             wxBLUE;
-WXDLLEXPORT_DATA(extern wxColour*)             wxGREEN;
-WXDLLEXPORT_DATA(extern wxColour*)             wxCYAN;
-WXDLLEXPORT_DATA(extern wxColour*)             wxLIGHT_GREY;
+WXDLLEXPORT_DATA(extern wxFont*)      wxNORMAL_FONT;
+WXDLLEXPORT_DATA(extern wxFont*)      wxSMALL_FONT;
+WXDLLEXPORT_DATA(extern wxFont*)      wxITALIC_FONT;
+WXDLLEXPORT_DATA(extern wxFont*)      wxSWISS_FONT;
+
+WXDLLEXPORT_DATA(extern wxPen*)      wxRED_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxCYAN_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxGREEN_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxBLACK_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxWHITE_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxTRANSPARENT_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxBLACK_DASHED_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxGREY_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxMEDIUM_GREY_PEN;
+WXDLLEXPORT_DATA(extern wxPen*)      wxLIGHT_GREY_PEN;
+
+WXDLLEXPORT_DATA(extern wxBrush*)    wxBLUE_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxGREEN_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxWHITE_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxBLACK_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxGREY_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxMEDIUM_GREY_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxLIGHT_GREY_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxTRANSPARENT_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxCYAN_BRUSH;
+WXDLLEXPORT_DATA(extern wxBrush*)    wxRED_BRUSH;
+
+WXDLLEXPORT_DATA(extern wxColour*)    wxBLACK;
+WXDLLEXPORT_DATA(extern wxColour*)    wxWHITE;
+WXDLLEXPORT_DATA(extern wxColour*)    wxRED;
+WXDLLEXPORT_DATA(extern wxColour*)    wxBLUE;
+WXDLLEXPORT_DATA(extern wxColour*)    wxGREEN;
+WXDLLEXPORT_DATA(extern wxColour*)    wxCYAN;
+WXDLLEXPORT_DATA(extern wxColour*)    wxLIGHT_GREY;

 
 // 'Null' objects
 
 // 'Null' objects

-WXDLLEXPORT_DATA(extern wxBitmap)              wxNullBitmap;
-WXDLLEXPORT_DATA(extern wxIcon)                wxNullIcon;
-WXDLLEXPORT_DATA(extern wxCursor)              wxNullCursor;
-WXDLLEXPORT_DATA(extern wxPen)                 wxNullPen;
-WXDLLEXPORT_DATA(extern wxBrush)               wxNullBrush;
-WXDLLEXPORT_DATA(extern wxPalette)             wxNullPalette;
-WXDLLEXPORT_DATA(extern wxFont)                wxNullFont;
-WXDLLEXPORT_DATA(extern wxColour)              wxNullColour;
+WXDLLEXPORT_DATA(extern wxBitmap)     wxNullBitmap;
+WXDLLEXPORT_DATA(extern wxIcon)       wxNullIcon;
+WXDLLEXPORT_DATA(extern wxCursor)     wxNullCursor;
+WXDLLEXPORT_DATA(extern wxPen)        wxNullPen;
+WXDLLEXPORT_DATA(extern wxBrush)      wxNullBrush;
+WXDLLEXPORT_DATA(extern wxPalette)     wxNullPalette;
+WXDLLEXPORT_DATA(extern wxFont)       wxNullFont;
+WXDLLEXPORT_DATA(extern wxColour)     wxNullColour;

 
 // Stock cursors types
 
 // Stock cursors types

-WXDLLEXPORT_DATA(extern wxCursor*)             wxSTANDARD_CURSOR;
-WXDLLEXPORT_DATA(extern wxCursor*)             wxHOURGLASS_CURSOR;
-WXDLLEXPORT_DATA(extern wxCursor*)             wxCROSS_CURSOR;
+WXDLLEXPORT_DATA(extern wxCursor*)    wxSTANDARD_CURSOR;
+WXDLLEXPORT_DATA(extern wxCursor*)    wxHOURGLASS_CURSOR;
+WXDLLEXPORT_DATA(extern wxCursor*)    wxCROSS_CURSOR;
+
+WXDLLEXPORT_DATA(extern wxColourDatabase*)  wxTheColourDatabase;
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+
+WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
+WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;

 
 

-WXDLLEXPORT_DATA(extern wxColourDatabase*)     wxTheColourDatabase;
+// The list of objects which should be deleted
+WXDLLEXPORT_DATA(extern wxList) wxPendingDelete;
+
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
+
+// resource management

 extern void WXDLLEXPORT wxInitializeStockObjects();
 extern void WXDLLEXPORT wxInitializeStockLists();
 extern void WXDLLEXPORT wxDeleteStockObjects();
 extern void WXDLLEXPORT wxDeleteStockLists();
 
 extern void WXDLLEXPORT wxInitializeStockObjects();
 extern void WXDLLEXPORT wxInitializeStockLists();
 extern void WXDLLEXPORT wxDeleteStockObjects();
 extern void WXDLLEXPORT wxDeleteStockLists();
 

+// is the display colour (or monochrome)?

 extern bool WXDLLEXPORT wxColourDisplay();
 
 // Returns depth of screen
 extern int WXDLLEXPORT wxDisplayDepth();
 #define wxGetDisplayDepth wxDisplayDepth
 
 extern bool WXDLLEXPORT wxColourDisplay();
 
 // Returns depth of screen
 extern int WXDLLEXPORT wxDisplayDepth();
 #define wxGetDisplayDepth wxDisplayDepth
 

+// get the diaplay 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();
 

+// set global cursor

 extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 

-// Useful macro for create icons portably
-
-#ifdef __WXMSW__
-# define wxICON(X) wxIcon(X##_icon);
-#elif defined(__X__)
-# define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);
-#else
-# define wxICON    wxIcon
-#endif
-
-/*
-  Example:
-  #define wxbuild_icon "wxbuild"
- 
-  wxIcon *icon = new wxICON(wxbuild);
- */
-
-class WXDLLEXPORT wxResourceCache: public wxList
-{
-  DECLARE_DYNAMIC_CLASS(wxResourceCache)
- public:
-   wxResourceCache();
-   wxResourceCache(const unsigned int the_key_type);
-   ~wxResourceCache();
-};
-

 #endif
 #endif

-    // __GDICMNH__
+    // _WX_GDICMNH__