X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c24e7adf051b2b522bcfc70d3ca70b07c206275..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/os2/dc.h diff --git a/include/wx/os2/dc.h b/include/wx/os2/dc.h index edeb7d1489..dfe7c050a5 100644 --- a/include/wx/os2/dc.h +++ b/include/wx/os2/dc.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.h +// Name: wx/os2/dc.h // Purpose: wxDC class // Author: David Webster // Modified by: @@ -97,7 +97,7 @@ public: // this is an ABC: use one of the derived classes to create a DC associated // with a window, screen, printer and so on -class WXDLLEXPORT wxPMDCImpl : public wxDCImpl +class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl { DECLARE_DYNAMIC_CLASS(wxDC) @@ -108,13 +108,13 @@ public: // implement base class pure virtuals // ---------------------------------- - virtual void Clear(void); + virtual void Clear(); virtual bool StartDoc(const wxString& rsMessage); - virtual void EndDoc(void); + virtual void EndDoc(); - virtual void StartPage(void); - virtual void EndPage(void); + virtual void StartPage(); + virtual void EndPage(); virtual void SetFont(const wxFont& rFont); virtual void SetPen(const wxPen& rPen); @@ -123,17 +123,17 @@ public: virtual void SetBackgroundMode(int nMode); virtual void SetPalette(const wxPalette& rPalette); - virtual void DestroyClippingRegion(void); + virtual void DestroyClippingRegion(); - virtual wxCoord GetCharHeight(void) const; - virtual wxCoord GetCharWidth(void) const; + virtual wxCoord GetCharHeight() const; + virtual wxCoord GetCharWidth() const; - virtual bool CanDrawBitmap(void) const; - virtual bool CanGetTextExtent(void) const; - virtual int GetDepth(void) const; - virtual wxSize GetPPI(void) const; + virtual bool CanDrawBitmap() const; + virtual bool CanGetTextExtent() const; + virtual int GetDepth() const; + virtual wxSize GetPPI() const; - virtual void SetMapMode(int nMode); + virtual void SetMapMode(wxMappingMode nMode); virtual void SetUserScale( double dX ,double dY ); @@ -149,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 // -------------------------- @@ -157,10 +157,10 @@ public: virtual void SetRop(WXHDC hCdc); virtual void SelectOldObjects(WXHDC hDc); - wxWindow* GetWindow(void) const { return m_pCanvas; } + wxWindow* GetWindow() const { return m_pCanvas; } void SetWindow(wxWindow* pWin) { m_pCanvas = pWin; } - WXHDC GetHDC(void) const { return m_hDC; } + WXHDC GetHDC() const { return m_hDC; } void SetHDC( WXHDC hDc ,bool bOwnsDC = FALSE ) @@ -169,13 +169,13 @@ public: m_bOwnsDC = bOwnsDC; } - HPS GetHPS(void) const { return m_hPS; } + HPS GetHPS() 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; } + const wxBitmap& GetSelectedBitmap() const { return m_vSelectedBitmap; } + wxBitmap& GetSelectedBitmap() { return m_vSelectedBitmap; } void UpdateClipBox(); @@ -190,29 +190,29 @@ public: static void AddToBitmapCache(wxDCCacheEntry* pEntry); static void AddToDCCache(wxDCCacheEntry* pEntry); - static void ClearCache(void); + static void ClearCache(); #endif protected: void Init() { - m_pCanvas = NULL; - m_hOldBitmap = 0; - m_hOldPen = 0; - m_hOldBrush = 0; - m_hOldFont = 0; + 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_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); + m_pen.SetColour(*wxBLACK); + m_brush.SetColour(*wxWHITE); } // create an uninitialized DC: this should be only used by the derived @@ -227,10 +227,10 @@ public: ,wxCoord* pExternalLeading = NULL ,const wxFont* pTheFont = NULL ) const; - virtual bool DoFloodFill( wxCoord vX - ,wxCoord vY - ,const wxColour& rCol - ,int nStyle = wxFLOOD_SURFACE + virtual bool DoFloodFill( wxCoord vX + ,wxCoord vY + ,const wxColour& rCol + ,wxFloodFillStyle nStyle = wxFLOOD_SURFACE ); virtual bool DoGetPixel( wxCoord vX @@ -315,18 +315,18 @@ public: ,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 DoSetDeviceClippingRegion(const wxRegion& rRegion); virtual void DoGetSize( int* pWidth ,int* pHeight @@ -344,12 +344,12 @@ public: ,wxPoint vaPoints[] ,wxCoord vXoffset ,wxCoord vYoffset - ,int nFillStyle = wxODDEVEN_RULE + ,wxPolygonFillMode nFillStyle = wxODDEVEN_RULE ); #if wxUSE_PALETTE void DoSelectPalette(bool bRealize = FALSE); - void InitializePalette(void); + void InitializePalette(); #endif // wxUSE_PALETTE protected: