// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#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"
+#include "wx/hashmap.h"
// ---------------------------------------------------------------------------
// 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
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
{
wxCURSOR_NONE, // should be 0
wxCURSOR_ARROW,
+ wxCURSOR_RIGHT_ARROW,
wxCURSOR_BULLSEYE,
wxCURSOR_CHAR,
wxCURSOR_CROSS,
#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 __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__)
// 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(__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
*/
#if defined(__WXMSW__) || defined(__WXPM__)
- #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+ #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
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
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 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; }
void SetWidth(int w) { x = w; }
int GetWidth() const { return x; }
int GetHeight() const { return y; }
+ bool IsFullySpecified() const { return x != -1 && y != -1; }
+
+ // combine this size with the other one replacing the default (i.e. equal
+ // to -1) components of this object with those of the other
+ void SetDefaults(const wxSize& size)
+ {
+ if ( x == -1 )
+ x = size.x;
+ if ( y == -1 )
+ y = size.y;
+ }
+
// compatibility
int GetX() const { return x; }
int GetY() const { return 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) 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
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
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
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);
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(); }
+
+ 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; }
class WXDLLEXPORT wxPenList : public wxList
{
- DECLARE_DYNAMIC_CLASS(wxPenList)
-
public:
wxPenList() { }
~wxPenList();
class WXDLLEXPORT wxBrushList : public wxList
{
- DECLARE_DYNAMIC_CLASS(wxBrushList)
-
public:
wxBrushList() { }
~wxBrushList();
wxBrush *FindOrCreateBrush(const wxColour& colour, int style);
};
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
class WXDLLEXPORT wxFontList : public wxList
{
- DECLARE_DYNAMIC_CLASS(wxFontList)
-
public:
wxFontList() { }
~wxFontList();
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
};
-class WXDLLEXPORT wxColourDatabase : public wxList
-{
- DECLARE_CLASS(wxColourDatabase)
+WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );
+class WXDLLEXPORT wxColourDatabase
+{
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;
- void Initialize();
+
+ // 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();
+
+ wxStringToColourHashMap *m_map;
};
class WXDLLEXPORT wxBitmapList : public wxList
{
- DECLARE_DYNAMIC_CLASS(wxBitmapList)
-
public:
wxBitmapList();
~wxBitmapList();
{
public:
wxResourceCache() { }
+#if !wxUSE_STL
wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
+#endif
~wxResourceCache();
-
-private:
- DECLARE_DYNAMIC_CLASS(wxResourceCache)
};
// ---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff