X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c14b6c3241d48d9cc36a2fd0aeab0ba330d96de..d85aece19960f1c09051d2bd5f54281272fde8ff:/src/motif/dcclient.cpp?ds=sidebyside diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index a04811cc5c..4622070bb8 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -141,11 +141,11 @@ void wxWindowDCImpl::Init() m_currentPenWidth = 1; m_currentPenJoin = -1; m_currentPenDashCount = -1; - m_currentPenDash = (wxX11Dash*) NULL; + m_currentPenDash = NULL; m_currentStyle = -1; m_currentFill = -1; m_colour = wxColourDisplay(); - m_display = (WXDisplay*) NULL; + m_display = NULL; m_pixmap = (WXPixmap) 0; m_autoSetting = 0; m_ok = false; @@ -161,7 +161,7 @@ wxWindowDCImpl::wxWindowDCImpl(wxDC *owner) wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *window) : wxMotifDCImpl(owner) { - wxASSERT_MSG( (window != (wxWindow*) NULL), "You must pass a valid wxWindow to wxWindowDCImpl/wxClientDCImpl/wxPaintDCImpl constructor." ); + wxASSERT_MSG( (window != NULL), "You must pass a valid wxWindow to wxWindowDCImpl/wxClientDCImpl/wxPaintDCImpl constructor." ); Init(); @@ -222,10 +222,10 @@ wxWindowDCImpl::~wxWindowDCImpl() } extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, - const wxColour & col, int style); + const wxColour & col, wxFloodFillStyle style); bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y, - const wxColour& col, int style) + const wxColour& col, wxFloodFillStyle style) { return wxDoFloodFill(GetOwner(), x, y, col, style); } @@ -471,7 +471,7 @@ void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCo } void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], - wxCoord xoffset, wxCoord yoffset, int fillStyle ) + wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle ) { wxCHECK_RET( IsOk(), "invalid dc" ); @@ -790,7 +790,7 @@ bool wxWindowDCImpl::CanDrawBitmap() const bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool useMask, + wxRasterOperationMode rop, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask ) { wxCHECK_MSG( IsOk(), false, "invalid dc" ); @@ -836,7 +836,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, // Do bitmap scaling if necessary - wxBitmap *scaledBitmap = (wxBitmap*) NULL; + wxBitmap *scaledBitmap = NULL; Pixmap sourcePixmap = (Pixmap) NULL; double scaleX, scaleY; GetUserScale(& scaleX, & scaleY); @@ -879,7 +879,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, if (m_pixmap && sourcePixmap) { /* MATTHEW: [9] */ - int orig = m_logicalFunction; + wxRasterOperationMode orig = m_logicalFunction; SetLogicalFunction (rop); @@ -1584,7 +1584,7 @@ void wxWindowDCImpl::SetPen( const wxPen &pen ) case wxTRANSPARENT: default: style = LineSolid; - req_dash = (wxX11Dash*)NULL; + req_dash = NULL; req_nb_dash = 0; } @@ -1930,7 +1930,7 @@ void wxWindowDCImpl::SetBackground( const wxBrush &brush ) m_backgroundPixel); } -void wxWindowDCImpl::SetLogicalFunction( int function ) +void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function ) { wxCHECK_RET( IsOk(), "invalid dc" );