// 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__
-#pragma interface "gdicmn.h"
+ #pragma interface "gdicmn.h"
#endif
#include "wx/object.h"
#include "wx/list.h"
#include "wx/hash.h"
+#include "wx/string.h"
#include "wx/setup.h"
+#include "wx/colour.h"
+#include "wx/font.h"
-#ifdef __WINDOWS__
-#include "wx/msw/colour.h"
-#elif defined(__MOTIF__)
-#include "wx/xt/colour.h"
-#elif defined(__GTK__)
-#include "wx/gtk/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_INVALID, // should be == 0 for compatibility!
+ wxBITMAP_TYPE_BMP,
+ 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_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
+};
// 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 __WXGTK__
+ wxCURSOR_DEFAULT, // standard X11 cursor
+#endif
#ifdef __X__
- /* Not yet implemented for Windows */
- , wxCURSOR_CROSS_REVERSE,
- wxCURSOR_DOUBLE_ARROW,
- wxCURSOR_BASED_ARROW_UP,
- wxCURSOR_BASED_ARROW_DOWN
+ // Not yet implemented for Windows
+ wxCURSOR_CROSS_REVERSE,
+ wxCURSOR_DOUBLE_ARROW,
+ wxCURSOR_BASED_ARROW_UP,
+ wxCURSOR_BASED_ARROW_DOWN,
+#endif // X11
+
+ wxCURSOR_MAX
+};
+
+#ifndef __WXGTK__
+ #define wxCURSOR_DEFAULT wxCURSOR_ARROW
#endif
-} _standard_cursors_t;
-class WXDLLEXPORT wxSize: public wxObject
+// ---------------------------------------------------------------------------
+// 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(__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(__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
+
+/* 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
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxSize
+// ---------------------------------------------------------------------------
+class WXDLLEXPORT wxSize
{
public:
- long x;
- long y;
- inline wxSize(void) { 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 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 (don't use them directly,
+ // especially that there names were chosen very unfortunately - they should
+ // have been called width and height)
+ int x, y;
+
+ // constructors
+ wxSize() { x = y = 0; }
+ 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; }
+
+ // 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(int xx, int yy) { x = xx; y = yy; }
+ void SetWidth(int w) { x = w; }
+ void SetHeight(int h) { y = h; }
+
+ int GetWidth() const { return x; }
+ int GetHeight() const { return y; }
+
+ // compatibility
+ int GetX() const { return x; }
+ int GetY() const { return y; }
};
-// Point
-class WXDLLEXPORT wxRealPoint: public wxObject
+// ---------------------------------------------------------------------------
+// Point classes: with real or integer coordinates
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxRealPoint
{
- DECLARE_DYNAMIC_CLASS(wxRealPoint)
- public:
- double x;
- double y;
- inline wxRealPoint(void) { x = 0.0; y = 0.0; };
- inline wxRealPoint(double the_x, double the_y) { x = the_x; y = the_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: public wxObject
+class WXDLLEXPORT wxPoint
{
- DECLARE_DYNAMIC_CLASS(wxPoint)
- public:
- long x;
- long y;
- inline wxPoint(void) { x = 0; y = 0; };
- wxPoint(long the_x, long the_y) { x = the_x; y = the_y; };
- inline void operator = (const wxPoint& pt) { x = pt.x; y = pt.y; }
+public:
+ int x, y;
+
+ wxPoint() { x = y = 0; };
+ wxPoint(int xx, int yy) { x = xx; y = yy; };
+
+ // no copy ctor or assignment operator - the defaults are ok
+
+ // 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
-#define wxIntPoint wxPoint
-#define wxRectangle wxRect
-#endif
+ #define wxIntPoint wxPoint
+ #define wxRectangle wxRect
+#endif // WXWIN_COMPATIBILITY
-class WXDLLEXPORT wxRect : public wxObject {
- DECLARE_DYNAMIC_CLASS(wxRect)
-public:
- wxRect(void) ;
- wxRect(const long x, const long y, const long w, const long h);
- wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
- wxRect(const wxPoint& pos, const wxSize& size);
- wxRect(const wxRect& rect);
-
- inline long GetX(void) const { return x; }
- inline void SetX(const long X) { x = X; }
- inline long GetY(void) const { return y; }
- inline void SetY(const long Y) { y = Y; }
- inline long GetWidth() const { return width; }
- inline void SetWidth(const long w) { width = w; }
- inline long GetHeight() const { return height; }
- inline void SetHeight(const long h) { height = h; }
-
- inline wxPoint GetPosition(void) { return wxPoint(x, y); }
- inline wxSize GetSize(void) { return wxSize(width, height); }
-
- inline long GetLeft(void) const { return x; }
- inline long GetTop(void) const { return y; }
- inline long GetBottom(void) const { return y + height; }
- inline long GetRight(void) const { return x + width; }
-
- wxRect& operator = (const wxRect& rect);
- bool operator == (const wxRect& rect);
- bool operator != (const wxRect& rect);
+// ---------------------------------------------------------------------------
+// wxRect
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxRect
+{
public:
- long x, y, width, height;
-};
+ wxRect() { x = y = width = height = 0; }
+ 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);
-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
- */
+ int GetX() const { return x; }
+ void SetX(int 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
+ int GetY() const { return y; }
+ void SetY(int yy) { y = yy; }
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxIcon;
+ int GetWidth() const { return width; }
+ void SetWidth(int w) { width = w; }
+
+ 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); }
+
+ 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; }
+
+ void Inflate(wxCoord dx, wxCoord dy)
+ {
+ x -= dx;
+ y -= dy;
+ width += 2*dx;
+ height += 2*dy;
+ }
+
+ void Inflate(wxCoord d) { Inflate(d, d); }
+
+ 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;
+ wxRect& operator+=(const wxRect& rect);
+
+public:
+ int x, y, width, height;
+};
+
+// ---------------------------------------------------------------------------
// Management of pens, brushes and fonts
-class WXDLLEXPORT wxPenList: public wxList
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPenList : public wxList
{
- DECLARE_DYNAMIC_CLASS(wxPenList)
- public:
- inline wxPenList(void)
- { }
- ~wxPenList(void);
- void AddPen(wxPen *pen);
- void RemovePen(wxPen *pen);
- wxPen *FindOrCreatePen(const wxColour& colour, const int width, const int style);
- wxPen *FindOrCreatePen(const wxString& colour, const int width, const 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(void)
- { }
- ~wxBrushList(void);
- void AddBrush(wxBrush *brush);
- void RemoveBrush(wxBrush *brush);
- wxBrush *FindOrCreateBrush(const wxColour& colour, const int style);
- wxBrush *FindOrCreateBrush(const wxString& colour, const 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
+class WXDLLEXPORT wxFontList : public wxList
{
- DECLARE_DYNAMIC_CLASS(wxFontList)
- public:
- inline wxFontList(void)
- { }
- ~wxFontList(void);
- void AddFont(wxFont *font);
- void RemoveFont(wxFont *font);
- wxFont *FindOrCreateFont(const int pointSize, const int family, const int style, const int weight,
- const bool underline = FALSE, const wxString& face = wxEmptyString);
+ 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,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
};
-class WXDLLEXPORT wxColourDatabase: public wxList
+class WXDLLEXPORT wxColourDatabase : public wxList
{
- DECLARE_CLASS(wxColourDatabase)
- public:
- wxColourDatabase(int type);
- ~wxColourDatabase(void) ;
- // Not const because it may add a name to the database
- wxColour *FindColour(const wxString& colour) ;
- wxString FindName(const wxColour& colour) const;
- void Initialize(void);
+ 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 wxBitmapList : public wxList
+{
+ 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(void);
- ~wxBitmapList(void);
+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
-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
-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
-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
-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;
-extern void WXDLLEXPORT wxInitializeStockObjects(void);
-extern void WXDLLEXPORT wxDeleteStockObjects(void);
+WXDLLEXPORT_DATA(extern wxColourDatabase*) wxTheColourDatabase;
-extern bool WXDLLEXPORT wxColourDisplay(void);
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
-// Returns depth of screen
-extern int WXDLLEXPORT wxDisplayDepth(void);
+WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
+WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
-extern void WXDLLEXPORT wxDisplaySize(int *width, int *height);
+// The list of objects which should be deleted
+WXDLLEXPORT_DATA(extern wxList) wxPendingDelete;
-extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
-// Useful macro for create icons portably
+// resource management
+extern void WXDLLEXPORT wxInitializeStockObjects();
+extern void WXDLLEXPORT wxInitializeStockLists();
+extern void WXDLLEXPORT wxDeleteStockObjects();
+extern void WXDLLEXPORT wxDeleteStockLists();
-#ifdef __WINDOWS__
-# define wxICON(X) wxIcon(X##_icon);
-#elif defined(__X__)
-# define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);
-#else
-# define wxICON wxIcon
-#endif
+// is the display colour (or monochrome)?
+extern bool WXDLLEXPORT wxColourDisplay();
-/*
- Example:
- #define wxbuild_icon "wxbuild"
-
- wxIcon *icon = new wxICON(wxbuild);
- */
+// 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();
+
+// set global cursor
+extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
#endif
- // __GDICMNH__
+ // _WX_GDICMNH__
projects / wxWidgets.git / blobdiff