X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222ed1d678dff2f5c3c4164321dd05e8f47de487..7c72311fe19b9451446e5f97bf7f8ee7535227a5:/include/wx/gdicmn.h diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index ae96ef1794..83858f5c85 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -16,7 +16,7 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "gdicmn.h" #endif @@ -24,21 +24,22 @@ #include "wx/list.h" #include "wx/string.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 @@ -116,7 +117,7 @@ enum wxStockCursor wxCURSOR_DEFAULT, // standard X11 cursor #endif #ifdef __WXMAC__ - wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow + wxCURSOR_COPY_ARROW , // MacOS Theme Plus arrow #endif #ifdef __X__ // Not yet implemented for Windows @@ -181,7 +182,12 @@ enum wxStockCursor #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__) +#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 @@ -215,6 +221,11 @@ public: 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; } @@ -223,6 +234,18 @@ public: 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; } @@ -268,12 +291,13 @@ public: 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 @@ -311,6 +335,16 @@ public: 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 GetBottom() const { return y + height - 1; } @@ -358,11 +392,11 @@ public: bool operator==(const wxRect& rect) const; bool operator!=(const wxRect& rect) const { return !(*this == rect); } - // return TRUE if the point is (not strcitly) inside the rect + // 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 + // return true if the rectangles have a non empty intersection bool Intersects(const wxRect& rect) const; public: @@ -377,11 +411,9 @@ typedef wxInt8 wxDash; class WXDLLEXPORT wxPenList : public wxList { - // DECLARE_DYNAMIC_CLASS(wxPenList) - public: wxPenList() { } - virtual ~wxPenList(); + ~wxPenList(); void AddPen(wxPen *pen); void RemovePen(wxPen *pen); @@ -390,11 +422,9 @@ public: class WXDLLEXPORT wxBrushList : public wxList { - // DECLARE_DYNAMIC_CLASS(wxBrushList) - public: wxBrushList() { } - virtual ~wxBrushList(); + ~wxBrushList(); void AddBrush(wxBrush *brush); void RemoveBrush(wxBrush *brush); @@ -403,53 +433,56 @@ public: class WXDLLEXPORT wxFontList : public wxList { - // DECLARE_DYNAMIC_CLASS(wxFontList) - public: wxFontList() { } - virtual ~wxFontList(); + ~wxFontList(); 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); }; -class WXDLLEXPORT wxStringToColourHashMap; +WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ); class WXDLLEXPORT wxColourDatabase { - // DECLARE_CLASS(wxColourDatabase) - public: wxColourDatabase(); - virtual ~wxColourDatabase() ; + ~wxColourDatabase(); - // Not const because it may add a name to the database - wxColour *FindColour(const wxString& colour) ; - wxColour *FindColourNoAdd(const wxString& colour) const; + // 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: - wxColour* FindColour(const wxString& colour, bool add); + // load the database with the built in colour values when called for the + // first time, do nothing after this + void Initialize(); - wxStringToColourHashMap* m_map; + wxStringToColourHashMap *m_map; }; class WXDLLEXPORT wxBitmapList : public wxList { - // DECLARE_DYNAMIC_CLASS(wxBitmapList) - public: - wxBitmapList(); - virtual ~wxBitmapList(); + wxBitmapList(){} + ~wxBitmapList(); void AddBitmap(wxBitmap *bitmap); void RemoveBitmap(wxBitmap *bitmap); @@ -462,10 +495,7 @@ public: #if !wxUSE_STL wxResourceCache(const unsigned int keyType) : wxList(keyType) { } #endif - virtual ~wxResourceCache(); - -private: - // DECLARE_DYNAMIC_CLASS(wxResourceCache) + ~wxResourceCache(); }; // ---------------------------------------------------------------------------