X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..0944fceb987def04dc89d03d58c35793d0ecdfed:/include/wx/motif/dcclient.h?ds=sidebyside diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h index ed8539615b..8522c8e23b 100644 --- a/include/wx/motif/dcclient.h +++ b/include/wx/motif/dcclient.h @@ -93,8 +93,8 @@ protected: // note that this function will call colour.SetPixel, // and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK // roundToWhite has an effect for monochrome display only - // if roundToWhite == TRUE then the colour will be set to white unless - // it is RGB 0x000000;if roundToWhite == FALSE the colour wull be set to + // if roundToWhite == true then the colour will be set to white unless + // it is RGB 0x000000;if roundToWhite == true the colour wull be set to // black unless it id RGB 0xffffff int CalculatePixel(wxColour& colour, wxColour& curCol, bool roundToWhite) const; @@ -129,7 +129,7 @@ protected: virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); + int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); virtual void DoSetClippingRegionAsRegion(const wxRegion& region); virtual void DoSetClippingRegion(wxCoord x, wxCoord y, @@ -168,6 +168,12 @@ protected: int m_currentStyle ; int m_currentFill ; int m_autoSetting ; // See comment in dcclient.cpp + + // this is useless and should be removed, kept for now just for backwards + // compatibility +#if wxCHECK_VERSION(2, 7, 0) + #error "Remove wxClientDC::m_oldFont" +#endif WXFont m_oldFont; };