X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/357b66eb5bf856d70d7aaab626a158e45197a483..74c34d22773e39b13fe0502798494b38f261a9e5:/include/wx/os2/dc.h diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index fd832ef932..f0a70ddb4e 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 @@ -85,7 +85,7 @@ public: wxDCCacheEntry( HPS hPS ,int nDepth ); - ~wxDCCacheEntry(); + virtual ~wxDCCacheEntry(); WXHBITMAP m_hBitmap; HPS m_hPS; @@ -95,13 +95,15 @@ public: }; // end of CLASS wxDCCacheEntry #endif -class WXDLLEXPORT wxDC : public wxDCBase +// 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 // ---------------------------------- @@ -125,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; @@ -141,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 ); @@ -156,7 +149,7 @@ public: virtual void SetAxisOrientation( bool bXLeftRight ,bool bYBottomUp ); - virtual void SetLogicalFunction(int nFunction); + virtual void SetLogicalFunction(wxRasterOperationMode nFunction); // implementation from now on // -------------------------- @@ -201,10 +194,43 @@ public: #endif protected: - virtual bool DoFloodFill( wxCoord vX - ,wxCoord vY - ,const wxColour& rCol - ,int nStyle = wxFLOOD_SURFACE + 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 + ,wxFloodFillStyle nStyle = wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord vX @@ -289,29 +315,18 @@ protected: ,wxDC* pSource ,wxCoord vXsrc ,wxCoord vYsrc - ,int nRop = wxCOPY + ,wxRasterOperationMode 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 @@ -329,7 +344,7 @@ protected: ,wxPoint vaPoints[] ,wxCoord vXoffset ,wxCoord vYoffset - ,int nFillStyle = wxODDEVEN_RULE + ,wxPolygonFillMode nFillStyle = wxODDEVEN_RULE ); #if wxUSE_PALETTE @@ -337,6 +352,7 @@ protected: void InitializePalette(void); #endif // wxUSE_PALETTE +protected: // // common part of DoDrawText() and DoDrawRotatedText() //