X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0532484d0f2f5fd592c16522a2b45e84422c9a5f..bf95a04f16759468ee7af83a7a78019399c648bb:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 063bce9b80..f9d4497c95 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -16,17 +16,14 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "gdicmn.h" #endif -#include "wx/object.h" +#include "wx/setup.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" +#include "wx/fontenc.h" // --------------------------------------------------------------------------- // forward declarations @@ -78,6 +75,8 @@ enum wxBitmapType 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 @@ -88,6 +87,7 @@ enum wxStockCursor { wxCURSOR_NONE, // should be 0 wxCURSOR_ARROW, + wxCURSOR_RIGHT_ARROW, wxCURSOR_BULLSEYE, wxCURSOR_CHAR, wxCURSOR_CROSS, @@ -115,6 +115,9 @@ enum wxStockCursor #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, @@ -148,13 +151,13 @@ enum wxStockCursor #ifdef __WXMSW__ // Load from a resource - #define wxICON(X) wxIcon("" #X "") + #define wxICON(X) wxIcon(wxT(#X)) #elif defined(__WXPM__) // Load from a resource - #define wxICON(X) wxIcon("" #X "") + #define wxICON(X) wxIcon(wxT(#X)) #elif defined(__WXMGL__) - // Load from a resource - #define wxICON(X) wxIcon("" #X "") + // 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 ) @@ -164,18 +167,21 @@ enum wxStockCursor #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 - #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 under Unix bitmaps live in XPMs and under Windows they're in ressources. */ -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMGL__) - #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE) -#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXMSW__) || defined(__WXPM__) + #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 @@ -193,14 +199,12 @@ enum wxStockCursor 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 - 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 @@ -234,13 +238,14 @@ public: 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) 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; } }; class WXDLLEXPORT wxPoint @@ -248,8 +253,8 @@ class WXDLLEXPORT wxPoint 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 @@ -277,9 +282,12 @@ 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) - { 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& pos, const wxSize& size); @@ -298,7 +306,10 @@ public: 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); } + void SetSize( const wxSize &s ) { width = s.GetWidth(); height = s.GetHeight(); } int GetLeft() const { return x; } int GetTop() const { return y; } @@ -366,11 +377,11 @@ typedef wxInt8 wxDash; class WXDLLEXPORT wxPenList : public wxList { - DECLARE_DYNAMIC_CLASS(wxPenList) + // DECLARE_DYNAMIC_CLASS(wxPenList) public: wxPenList() { } - ~wxPenList(); + virtual ~wxPenList(); void AddPen(wxPen *pen); void RemovePen(wxPen *pen); @@ -379,26 +390,24 @@ public: class WXDLLEXPORT wxBrushList : public wxList { - DECLARE_DYNAMIC_CLASS(wxBrushList) + // DECLARE_DYNAMIC_CLASS(wxBrushList) public: wxBrushList() { } - ~wxBrushList(); + virtual ~wxBrushList(); void AddBrush(wxBrush *brush); void RemoveBrush(wxBrush *brush); wxBrush *FindOrCreateBrush(const wxColour& colour, int style); }; -WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; - class WXDLLEXPORT wxFontList : public wxList { - DECLARE_DYNAMIC_CLASS(wxFontList) + // DECLARE_DYNAMIC_CLASS(wxFontList) public: wxFontList() { } - ~wxFontList(); + virtual ~wxFontList(); void AddFont(wxFont *font); void RemoveFont(wxFont *font); @@ -408,32 +417,40 @@ public: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); }; -class WXDLLEXPORT wxColourDatabase : public wxList +class WXDLLEXPORT wxStringToColourHashMap; + +class WXDLLEXPORT wxColourDatabase { - DECLARE_CLASS(wxColourDatabase) + // DECLARE_CLASS(wxColourDatabase) public: - wxColourDatabase(int type); - ~wxColourDatabase() ; + wxColourDatabase(); + virtual ~wxColourDatabase() ; // Not const because it may add a name to the database wxColour *FindColour(const wxString& colour) ; + wxColour *FindColourNoAdd(const wxString& colour) const; wxString FindName(const wxColour& colour) const; + void AddColour(const wxString& name, wxColour* colour); void Initialize(); #ifdef __WXPM__ // PM keeps its own type of colour table long* m_palTable; size_t m_nSize; #endif +private: + wxColour* FindColour(const wxString& colour, bool add); + + wxStringToColourHashMap* m_map; }; class WXDLLEXPORT wxBitmapList : public wxList { - DECLARE_DYNAMIC_CLASS(wxBitmapList) + // DECLARE_DYNAMIC_CLASS(wxBitmapList) public: wxBitmapList(); - ~wxBitmapList(); + virtual ~wxBitmapList(); void AddBitmap(wxBitmap *bitmap); void RemoveBitmap(wxBitmap *bitmap); @@ -443,11 +460,13 @@ class WXDLLEXPORT wxResourceCache: public wxList { public: wxResourceCache() { } +#if !wxUSE_STL wxResourceCache(const unsigned int keyType) : wxList(keyType) { } - ~wxResourceCache(); +#endif + virtual ~wxResourceCache(); private: - DECLARE_DYNAMIC_CLASS(wxResourceCache) + // DECLARE_DYNAMIC_CLASS(wxResourceCache) }; // ---------------------------------------------------------------------------