X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7e1a3227440c2910124edfc8896bbe23d6d0ab3..1425eca550ca78f6d0824e50376d763aff17242d:/include/wx/os2/dc.h diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index debf4df06b..aff30c67ea 100644 --- a/include/wx/os2/dc.h +++ b/include/wx/os2/dc.h @@ -13,7 +13,7 @@ #define _WX_DC_H_ #include "wx/defs.h" -//#include "wx/dc.h" +#include "wx/dc.h" // --------------------------------------------------------------------------- // macros @@ -67,13 +67,43 @@ #define wx_round(a) (int)((a)+.5) -class WXDLLEXPORT wxDC : public wxDCBase +#if wxUSE_DC_CACHEING +/* + * Cached blitting, maintaining a cache + * of bitmaps required for transparent blitting + * instead of constant creation/deletion + */ + +class wxDCCacheEntry : public wxObject +{ +public: + wxDCCacheEntry( WXHBITMAP hBitmap + ,int nWidth + ,int nHeight + ,int nDepth + ); + wxDCCacheEntry( HPS hPS + ,int nDepth + ); + virtual ~wxDCCacheEntry(); + + WXHBITMAP m_hBitmap; + HPS m_hPS; + int m_nWidth; + int m_nHeight; + int m_nDepth; +}; // end of CLASS wxDCCacheEntry +#endif + +// this is an ABC: use one of the derived classes to create a DC associated +// with a window, screen, printer and so on +class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl { DECLARE_DYNAMIC_CLASS(wxDC) public: - wxDC(void); - ~wxDC(); + wxPMDCImpl(wxDC *owner, WXHDC hDC); + virtual ~wxPMDCImpl(); // implement base class pure virtuals // ---------------------------------- @@ -97,13 +127,7 @@ public: virtual wxCoord GetCharHeight(void) const; virtual wxCoord GetCharWidth(void) const; - virtual void DoGetTextExtent( const wxString& rsString - ,wxCoord* pX - ,wxCoord* pY - ,wxCoord* pDescent = NULL - ,wxCoord* pExternalLeading = NULL - ,wxFont* pTheFont = NULL - ) const; + virtual bool CanDrawBitmap(void) const; virtual bool CanGetTextExtent(void) const; virtual int GetDepth(void) const; @@ -113,9 +137,6 @@ public: virtual void SetUserScale( double dX ,double dY ); - virtual void SetSystemScale( double dX - ,double dY - ); virtual void SetLogicalScale( double dX ,double dY ); @@ -148,11 +169,65 @@ public: m_bOwnsDC = bOwnsDC; } + HPS GetHPS(void) const { return m_hPS; } + void SetHPS(HPS hPS) + { + m_hPS = hPS; + } const wxBitmap& GetSelectedBitmap(void) const { return m_vSelectedBitmap; } wxBitmap& GetSelectedBitmap(void) { return m_vSelectedBitmap; } + void UpdateClipBox(); + +#if wxUSE_DC_CACHEING + static wxDCCacheEntry* FindBitmapInCache( HPS hPS + ,int nWidth + ,int nHeight + ); + static wxDCCacheEntry* FindDCInCache( wxDCCacheEntry* pNotThis + ,HPS hPS + ); + + static void AddToBitmapCache(wxDCCacheEntry* pEntry); + static void AddToDCCache(wxDCCacheEntry* pEntry); + static void ClearCache(void); +#endif + protected: - virtual void DoFloodFill( wxCoord vX + void Init() + { + m_pCanvas = NULL; + m_hOldBitmap = 0; + m_hOldPen = 0; + m_hOldBrush = 0; + m_hOldFont = 0; +#if wxUSE_PALETTE + m_hOldPalette = 0; +#endif // wxUSE_PALETTE + + m_bOwnsDC = false; + m_hDC = 0; + m_hOldPS = NULL; + m_hPS = NULL; + m_bIsPaintTime = false; // True at Paint Time + + m_pen.SetColour(*wxBLACK); + m_brush.SetColour(*wxWHITE); + } + + // create an uninitialized DC: this should be only used by the derived + // classes + wxPMDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); } + +public: + virtual void DoGetTextExtent( const wxString& rsString + ,wxCoord* pX + ,wxCoord* pY + ,wxCoord* pDescent = NULL + ,wxCoord* pExternalLeading = NULL + ,const wxFont* pTheFont = NULL + ) const; + virtual bool DoFloodFill( wxCoord vX ,wxCoord vY ,const wxColour& rCol ,int nStyle = wxFLOOD_SURFACE @@ -242,25 +317,16 @@ protected: ,wxCoord vYsrc ,int nRop = wxCOPY ,bool bUseMask = FALSE + ,wxCoord vXsrcMask = -1 + ,wxCoord vYsrcMask = -1 ); - virtual void DoSetClippingRegionAsRegion(const wxRegion& rRegion); virtual void DoSetClippingRegion( wxCoord vX ,wxCoord vY ,wxCoord vWidth ,wxCoord vHeight ); - virtual void DoGetClippingRegion( wxCoord* pX - ,wxCoord* pY - ,wxCoord* pWidth - ,wxCoord* pHeight) - { - GetClippingBox( pX - ,pY - ,pWidth - ,pHeight - ); - } + virtual void DoSetDeviceClippingRegion(const wxRegion& rRegion); virtual void DoGetSize( int* pWidth ,int* pHeight @@ -281,10 +347,12 @@ protected: ,int nFillStyle = wxODDEVEN_RULE ); -#if wxUSE_SPLINES - virtual void DoDrawSpline(wxList* pPoints); -#endif // wxUSE_SPLINES +#if wxUSE_PALETTE + void DoSelectPalette(bool bRealize = FALSE); + void InitializePalette(void); +#endif // wxUSE_PALETTE +protected: // // common part of DoDrawText() and DoDrawRotatedText() // @@ -316,11 +384,9 @@ public: bool m_bOwnsDC:1; // - // our HDC and its usage count: we only free it when the usage count drops - // to 0 + // our HDC // WXHDC m_hDC; - int m_nDCCount; // // Store all old GDI objects when do a SelectObject, so we can select them @@ -332,6 +398,11 @@ public: WXHBRUSH m_hOldBrush; WXHFONT m_hOldFont; WXHPALETTE m_hOldPalette; -}; + +#if wxUSE_DC_CACHEING + static wxList m_svBitmapCache; + static wxList m_svDCCache; +#endif +}; // end of CLASS wxDC #endif // _WX_DC_H_