X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/gdicmn.h?ds=sidebyside diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 5018eece64..bc3efb2c50 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gdicmn.h +// Name: wx/gdicmn.h // Purpose: Common GDI classes, types and declarations // Author: Julian Smart // Modified by: @@ -21,6 +21,7 @@ #include "wx/string.h" #include "wx/fontenc.h" #include "wx/hashmap.h" +#include "wx/math.h" // --------------------------------------------------------------------------- // forward declarations @@ -228,6 +229,18 @@ public: void DecTo(const wxSize& sz) { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; } + void IncBy(int dx, int dy) { x += dx; y += dy; } + void IncBy(const wxSize& sz) { IncBy(sz.x, sz.y); } + void IncBy(int d) { IncBy(d, d); } + + void DecBy(int dx, int dy) { IncBy(-dx, -dy); } + void DecBy(const wxSize& sz) { DecBy(sz.x, sz.y); } + void DecBy(int d) { DecBy(d, d); } + + + void Scale(float xscale, float yscale) + { x = (int)(x*xscale); y = (int)(y*yscale); } + // accessors void Set(int xx, int yy) { x = xx; y = yy; } void SetWidth(int w) { x = w; } @@ -269,10 +282,14 @@ public: 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; } + bool operator==(const wxRealPoint& pt) const + { + return wxIsSameDouble(x, pt.x) && wxIsSameDouble(y, pt.y); + } + bool operator!=(const wxRealPoint& pt) const { return !(*this == pt); } }; + class WXDLLEXPORT wxPoint { public: @@ -299,6 +316,8 @@ public: 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()); } + + wxPoint operator-() const { return wxPoint(-x, -y); } }; // --------------------------------------------------------------------------- @@ -344,6 +363,16 @@ public: bool IsEmpty() const { return (width <= 0) || (height <= 0); } + 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; } + wxPoint GetTopLeft() const { return GetPosition(); } wxPoint GetLeftTop() const { return GetTopLeft(); } void SetTopLeft(const wxPoint &p) { SetPosition(p); } @@ -354,18 +383,19 @@ public: 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; } - int GetRight() const { return x + width - 1; } + wxPoint GetTopRight() const { return wxPoint(GetRight(), GetTop()); } + wxPoint GetRightTop() const { return GetTopRight(); } + void SetTopRight(const wxPoint &p) { SetRight(p.x); SetTop(p.y); } + void SetRightTop(const wxPoint &p) { SetTopLeft(p); } - 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; } + wxPoint GetBottomLeft() const { return wxPoint(GetLeft(), GetBottom()); } + wxPoint GetLeftBottom() const { return GetBottomLeft(); } + void SetBottomLeft(const wxPoint &p) { SetLeft(p.x); SetBottom(p.y); } + void SetLeftBottom(const wxPoint &p) { SetBottomLeft(p); } // operations with rect wxRect& Inflate(wxCoord dx, wxCoord dy); + wxRect& Inflate(const wxSize& d) { return Inflate(d.x, d.y); } wxRect& Inflate(wxCoord d) { return Inflate(d, d); } wxRect Inflate(wxCoord dx, wxCoord dy) const { @@ -375,6 +405,7 @@ public: } wxRect& Deflate(wxCoord dx, wxCoord dy) { return Inflate(-dx, -dy); } + wxRect& Deflate(const wxSize& d) { return Inflate(-d.x, -d.y); } wxRect& Deflate(wxCoord d) { return Inflate(-d); } wxRect Deflate(wxCoord dx, wxCoord dy) const { @@ -407,8 +438,17 @@ public: bool operator!=(const wxRect& rect) const { return !(*this == 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); } + bool Contains(int x, int y) const; + bool Contains(const wxPoint& pt) const { return Contains(pt.x, pt.y); } + // return true if the rectangle is (not strcitly) inside the rect + bool Contains(const wxRect& rect) const; + +#if WXWIN_COMPATIBILITY_2_6 + // use Contains() instead + wxDEPRECATED( bool Inside(int x, int y) const ); + wxDEPRECATED( bool Inside(const wxPoint& pt) const ); + wxDEPRECATED( bool Inside(const wxRect& rect) const ); +#endif // WXWIN_COMPATIBILITY_2_6 // return true if the rectangles have a non empty intersection bool Intersects(const wxRect& rect) const; @@ -423,53 +463,80 @@ public: } + // centre this rectangle in the given (usually, but not necessarily, + // larger) one + wxRect CentreIn(const wxRect& r, int dir = wxBOTH) const + { + return wxRect(dir & wxHORIZONTAL ? r.x + (r.width - width)/2 : x, + dir & wxVERTICAL ? r.y + (r.height - height)/2 : y, + width, height); + } + + wxRect CenterIn(const wxRect& r, int dir = wxBOTH) const + { + return CentreIn(r, dir); + } + public: int x, y, width, height; }; +#if WXWIN_COMPATIBILITY_2_6 +inline bool wxRect::Inside(int x, int y) const { return Contains(x, y); } +inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); } +inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); } +#endif // WXWIN_COMPATIBILITY_2_6 + + // --------------------------------------------------------------------------- // Management of pens, brushes and fonts // --------------------------------------------------------------------------- typedef wxInt8 wxDash; -class WXDLLEXPORT wxPenList : public wxList -{ +class WXDLLIMPEXP_CORE wxGDIObjListBase { public: - wxPenList() { } - ~wxPenList(); + wxGDIObjListBase(); + ~wxGDIObjListBase(); - void AddPen(wxPen *pen); - void RemovePen(wxPen *pen); - wxPen *FindOrCreatePen(const wxColour& colour, int width, int style); +protected: + wxList list; }; -class WXDLLEXPORT wxBrushList : public wxList +class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase { public: - wxBrushList() { } - ~wxBrushList(); + wxPen *FindOrCreatePen(const wxColour& colour, int width, int style); +#if WXWIN_COMPATIBILITY_2_6 + wxDEPRECATED( void AddPen(wxPen*) ); + wxDEPRECATED( void RemovePen(wxPen*) ); +#endif +}; - void AddBrush(wxBrush *brush); - void RemoveBrush(wxBrush *brush); +class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase +{ +public: wxBrush *FindOrCreateBrush(const wxColour& colour, int style = wxSOLID); +#if WXWIN_COMPATIBILITY_2_6 + wxDEPRECATED( void AddBrush(wxBrush*) ); + wxDEPRECATED( void RemoveBrush(wxBrush*) ); +#endif }; -class WXDLLEXPORT wxFontList : public wxList +class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase { 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); +#if WXWIN_COMPATIBILITY_2_6 + wxDEPRECATED( void AddFont(wxFont*) ); + wxDEPRECATED( void RemoveFont(wxFont*) ); +#endif }; -WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ); +WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap); class WXDLLEXPORT wxColourDatabase { @@ -484,8 +551,10 @@ public: // add a new colour to the database void AddColour(const wxString& name, const wxColour& colour); +#if WXWIN_COMPATIBILITY_2_6 // deprecated, use Find() instead wxDEPRECATED( wxColour *FindColour(const wxString& name) ); +#endif // WXWIN_COMPATIBILITY_2_6 #ifdef __WXPM__ @@ -502,16 +571,6 @@ private: wxStringToColourHashMap *m_map; }; -class WXDLLEXPORT wxBitmapList : public wxList -{ -public: - wxBitmapList(){} - ~wxBitmapList(); - - void AddBitmap(wxBitmap *bitmap); - void RemoveBitmap(wxBitmap *bitmap); -}; - class WXDLLEXPORT wxResourceCache: public wxList { public: @@ -519,7 +578,7 @@ public: #if !wxUSE_STL wxResourceCache(const unsigned int keyType) : wxList(keyType) { } #endif - ~wxResourceCache(); + virtual ~wxResourceCache(); }; // --------------------------------------------------------------------------- @@ -530,43 +589,117 @@ public: extern WXDLLEXPORT_DATA(wxPenList*) wxThePenList; extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList; extern WXDLLEXPORT_DATA(wxFontList*) wxTheFontList; -extern WXDLLEXPORT_DATA(wxBitmapList*) wxTheBitmapList; - -// Stock objects -extern WXDLLEXPORT_DATA(wxFont*) wxNORMAL_FONT; -extern WXDLLEXPORT_DATA(wxFont*) wxSMALL_FONT; -extern WXDLLEXPORT_DATA(wxFont*) wxITALIC_FONT; -extern WXDLLEXPORT_DATA(wxFont*) wxSWISS_FONT; - -extern WXDLLEXPORT_DATA(wxPen*) wxRED_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxCYAN_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxGREEN_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxBLACK_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxWHITE_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxTRANSPARENT_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxBLACK_DASHED_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxGREY_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxMEDIUM_GREY_PEN; -extern WXDLLEXPORT_DATA(wxPen*) wxLIGHT_GREY_PEN; - -extern WXDLLEXPORT_DATA(wxBrush*) wxBLUE_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxGREEN_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxWHITE_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxBLACK_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxGREY_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxMEDIUM_GREY_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxLIGHT_GREY_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxTRANSPARENT_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxCYAN_BRUSH; -extern WXDLLEXPORT_DATA(wxBrush*) wxRED_BRUSH; - -extern WXDLLEXPORT_DATA(wxColour*) wxBLACK; -extern WXDLLEXPORT_DATA(wxColour*) wxWHITE; -extern WXDLLEXPORT_DATA(wxColour*) wxRED; -extern WXDLLEXPORT_DATA(wxColour*) wxBLUE; -extern WXDLLEXPORT_DATA(wxColour*) wxGREEN; -extern WXDLLEXPORT_DATA(wxColour*) wxCYAN; -extern WXDLLEXPORT_DATA(wxColour*) wxLIGHT_GREY; + +/* Stock objects + + wxStockGDI creates the stock GDI objects on demand. Pointers to the + created objects are stored in the ms_stockObject array, which is indexed + by the Item enum values. Platorm-specific fonts can be created by + implementing a derived class with an override for the GetFont function. + wxStockGDI operates as a singleton, accessed through the ms_instance + pointer. By default this pointer is set to an instance of wxStockGDI. + A derived class must arrange to set this pointer to an instance of itself. +*/ +class WXDLLIMPEXP_CORE wxStockGDI +{ +public: + enum Item { + BRUSH_BLACK, + BRUSH_BLUE, + BRUSH_CYAN, + BRUSH_GREEN, + BRUSH_GREY, + BRUSH_LIGHTGREY, + BRUSH_MEDIUMGREY, + BRUSH_RED, + BRUSH_TRANSPARENT, + BRUSH_WHITE, + COLOUR_BLACK, + COLOUR_BLUE, + COLOUR_CYAN, + COLOUR_GREEN, + COLOUR_LIGHTGREY, + COLOUR_RED, + COLOUR_WHITE, + CURSOR_CROSS, + CURSOR_HOURGLASS, + CURSOR_STANDARD, + FONT_ITALIC, + FONT_NORMAL, + FONT_SMALL, + FONT_SWISS, + PEN_BLACK, + PEN_BLACKDASHED, + PEN_CYAN, + PEN_GREEN, + PEN_GREY, + PEN_LIGHTGREY, + PEN_MEDIUMGREY, + PEN_RED, + PEN_TRANSPARENT, + PEN_WHITE, + ITEMCOUNT + }; + + wxStockGDI(); + virtual ~wxStockGDI(); + static void DeleteAll(); + + static wxStockGDI& instance() { return *ms_instance; } + + static const wxBrush* GetBrush(Item item); + static const wxColour* GetColour(Item item); + static const wxCursor* GetCursor(Item item); + // Can be overridden by platform-specific derived classes + virtual const wxFont* GetFont(Item item); + static const wxPen* GetPen(Item item); + +protected: + static wxStockGDI* ms_instance; + + static wxObject* ms_stockObject[ITEMCOUNT]; + + DECLARE_NO_COPY_CLASS(wxStockGDI) +}; + +#define wxITALIC_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_ITALIC) +#define wxNORMAL_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_NORMAL) +#define wxSMALL_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_SMALL) +#define wxSWISS_FONT wxStockGDI::instance().GetFont(wxStockGDI::FONT_SWISS) + +#define wxBLACK_DASHED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED) +#define wxBLACK_PEN wxStockGDI::GetPen(wxStockGDI::PEN_BLACK) +#define wxCYAN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_CYAN) +#define wxGREEN_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREEN) +#define wxGREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_GREY) +#define wxLIGHT_GREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_LIGHTGREY) +#define wxMEDIUM_GREY_PEN wxStockGDI::GetPen(wxStockGDI::PEN_MEDIUMGREY) +#define wxRED_PEN wxStockGDI::GetPen(wxStockGDI::PEN_RED) +#define wxTRANSPARENT_PEN wxStockGDI::GetPen(wxStockGDI::PEN_TRANSPARENT) +#define wxWHITE_PEN wxStockGDI::GetPen(wxStockGDI::PEN_WHITE) + +#define wxBLACK_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_BLACK) +#define wxBLUE_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_BLUE) +#define wxCYAN_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_CYAN) +#define wxGREEN_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_GREEN) +#define wxGREY_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_GREY) +#define wxLIGHT_GREY_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_LIGHTGREY) +#define wxMEDIUM_GREY_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_MEDIUMGREY) +#define wxRED_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_RED) +#define wxTRANSPARENT_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_TRANSPARENT) +#define wxWHITE_BRUSH wxStockGDI::GetBrush(wxStockGDI::BRUSH_WHITE) + +#define wxBLACK wxStockGDI::GetColour(wxStockGDI::COLOUR_BLACK) +#define wxBLUE wxStockGDI::GetColour(wxStockGDI::COLOUR_BLUE) +#define wxCYAN wxStockGDI::GetColour(wxStockGDI::COLOUR_CYAN) +#define wxGREEN wxStockGDI::GetColour(wxStockGDI::COLOUR_GREEN) +#define wxLIGHT_GREY wxStockGDI::GetColour(wxStockGDI::COLOUR_LIGHTGREY) +#define wxRED wxStockGDI::GetColour(wxStockGDI::COLOUR_RED) +#define wxWHITE wxStockGDI::GetColour(wxStockGDI::COLOUR_WHITE) + +#define wxCROSS_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_CROSS) +#define wxHOURGLASS_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_HOURGLASS) +#define wxSTANDARD_CURSOR wxStockGDI::GetCursor(wxStockGDI::CURSOR_STANDARD) // 'Null' objects extern WXDLLEXPORT_DATA(wxBitmap) wxNullBitmap; @@ -578,29 +711,19 @@ extern WXDLLEXPORT_DATA(wxPalette) wxNullPalette; extern WXDLLEXPORT_DATA(wxFont) wxNullFont; extern WXDLLEXPORT_DATA(wxColour) wxNullColour; -// Stock cursors types -extern WXDLLEXPORT_DATA(wxCursor*) wxSTANDARD_CURSOR; -extern WXDLLEXPORT_DATA(wxCursor*) wxHOURGLASS_CURSOR; -extern WXDLLEXPORT_DATA(wxCursor*) wxCROSS_CURSOR; - extern WXDLLEXPORT_DATA(wxColourDatabase*) wxTheColourDatabase; -extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[]; extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; -// The list of objects which should be deleted -extern WXDLLEXPORT_DATA(wxList) wxPendingDelete; - // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- // resource management -extern void WXDLLEXPORT wxInitializeStockObjects(); extern void WXDLLEXPORT wxInitializeStockLists(); -extern void WXDLLEXPORT wxDeleteStockObjects(); extern void WXDLLEXPORT wxDeleteStockLists(); // is the display colour (or monochrome)?