X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/729be74dd1d94ea2b6c3fbe3feb25fda8d448205..d60913555cda566d162d73c15c82b78c920a246b:/src/motif/dcclient.cpp diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp index 9c18f84d94..3459154e7f 100644 --- a/src/motif/dcclient.cpp +++ b/src/motif/dcclient.cpp @@ -135,7 +135,7 @@ wxWindowDC::wxWindowDC() m_currentPenWidth = 1; m_currentPenJoin = -1; m_currentPenDashCount = -1; - m_currentPenDash = (wxMOTIFDash*) NULL; + m_currentPenDash = (wxX11Dash*) NULL; m_currentStyle = -1; m_currentFill = -1; // m_currentBkMode = wxTRANSPARENT; @@ -160,7 +160,7 @@ wxWindowDC::wxWindowDC( wxWindow *window ) m_currentPenWidth = 1; m_currentPenJoin = -1; m_currentPenDashCount = -1; - m_currentPenDash = (wxMOTIFDash*) NULL; + m_currentPenDash = (wxX11Dash*) NULL; m_currentStyle = -1; m_currentFill = -1; // m_currentBkMode = wxTRANSPARENT; @@ -826,7 +826,7 @@ void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y) SetPen (m_pen); int width, height; - Pixmap iconPixmap = (Pixmap) icon.GetPixmap(); + Pixmap iconPixmap = (Pixmap) icon.GetDrawable(); width = icon.GetWidth(); height = icon.GetHeight(); if (icon.GetDisplay() == m_display) @@ -941,7 +941,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he wxImage image = bitmap.ConvertToImage(); if (!image.Ok()) { - sourcePixmap = (Pixmap) bitmap.GetPixmap(); + sourcePixmap = (Pixmap) bitmap.GetDrawable(); } else { @@ -950,7 +950,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he image = image.Scale(scaledW, scaledH); scaledBitmap = new wxBitmap(image); - sourcePixmap = (Pixmap) scaledBitmap->GetPixmap(); + sourcePixmap = (Pixmap) scaledBitmap->GetDrawable(); } } else @@ -982,9 +982,9 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he { wxMemoryDC *memDC = (wxMemoryDC *)source; wxBitmap& sel = memDC->GetBitmap(); - if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() ) + if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetBitmap() ) { - XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap()); + XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetBitmap()); XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest)); } } @@ -1033,9 +1033,9 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he { wxMemoryDC *memDC = (wxMemoryDC *)source; wxBitmap& sel = memDC->GetBitmap(); - if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetPixmap() ) + if ( sel.Ok() && sel.GetMask() && sel.GetMask()->GetBitmap() ) { - XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetPixmap()); + XSetClipMask ((Display*) m_display, (GC) m_gc, (Pixmap) sel.GetMask()->GetBitmap()); XSetClipOrigin ((Display*) m_display, (GC) m_gc, XLOG2DEV (xdest), YLOG2DEV (ydest)); } } @@ -1130,7 +1130,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) &ascent, &descent, &overall_return); else #endif // 0 - (void)XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) text, slen, &direction, + (void)XTextExtents((XFontStruct*) pFontStruct, + wxConstCast(text.c_str(), char), + slen, &direction, &ascent, &descent, &overall_return); cx = overall_return.width; @@ -1222,7 +1224,8 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) else #endif // 0 XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking, - XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, (char*) (const char*) text, slen); + XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent, + wxConstCast(text.c_str(), char), slen); } // restore fill style @@ -1291,7 +1294,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, else #endif // 0 (void)XTextExtents((XFontStruct*) pFontStruct, - (char*)text.c_str(), slen, &direction, + wxConstCast(text.c_str(), char), + slen, &direction, &ascent, &descent, &overall_return); cx = overall_return.width; @@ -1437,7 +1441,8 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor &ascent, &descent2, &overall); else #endif // 0 - XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction, + XTextExtents((XFontStruct*) pFontStruct, + wxConstCast(string.c_str(), char), slen, &direction, &ascent, &descent2, &overall); if (width) *width = XDEV2LOGREL (overall.width); @@ -1636,7 +1641,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) int old_pen_join = m_currentPenJoin; int old_pen_cap = m_currentPenCap; int old_pen_nb_dash = m_currentPenDashCount; - wxMOTIFDash *old_pen_dash = m_currentPenDash; + wxX11Dash *old_pen_dash = m_currentPenDash; wxColour oldPenColour = m_currentColour; m_currentColour = m_pen.GetColour (); @@ -1646,7 +1651,7 @@ void wxWindowDC::SetPen( const wxPen &pen ) m_currentPenJoin = m_pen.GetJoin (); m_currentPenCap = m_pen.GetCap (); m_currentPenDashCount = m_pen.GetDashCount(); - m_currentPenDash = (wxMOTIFDash*)m_pen.GetDash(); + m_currentPenDash = (wxX11Dash*)m_pen.GetDash(); if (m_currentStyle == wxSTIPPLE) m_currentStipple = * m_pen.GetStipple (); @@ -1674,15 +1679,15 @@ void wxWindowDC::SetPen( const wxPen &pen ) int style; int join; int cap; - static const wxMOTIFDash dotted[] = {2, 5}; - static const wxMOTIFDash short_dashed[] = {4, 4}; - static const wxMOTIFDash long_dashed[] = {4, 8}; - static const wxMOTIFDash dotted_dashed[] = {6, 6, 2, 6}; + static const wxX11Dash dotted[] = {2, 5}; + static const wxX11Dash short_dashed[] = {4, 4}; + static const wxX11Dash long_dashed[] = {4, 8}; + static const wxX11Dash dotted_dashed[] = {6, 6, 2, 6}; // We express dash pattern in pen width unit, so we are // independent of zoom factor and so on... int req_nb_dash; - const wxMOTIFDash *req_dash; + const wxX11Dash *req_dash; switch (m_pen.GetStyle ()) { @@ -1716,13 +1721,13 @@ void wxWindowDC::SetPen( const wxPen &pen ) case wxTRANSPARENT: default: style = LineSolid; - req_dash = (wxMOTIFDash*)NULL; + req_dash = (wxX11Dash*)NULL; req_nb_dash = 0; } if (req_dash && req_nb_dash) { - wxMOTIFDash *real_req_dash = new wxMOTIFDash[req_nb_dash]; + wxX11Dash *real_req_dash = new wxX11Dash[req_nb_dash]; if (real_req_dash) { int factor = scaled_width == 0 ? 1 : scaled_width; @@ -1838,10 +1843,10 @@ void wxWindowDC::SetPen( const wxPen &pen ) else if (m_currentStipple.Ok() && ((m_currentStipple != oldStipple) || !GetOptimization())) { - XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetPixmap()); + XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable()); if (m_window && m_window->GetBackingPixmap()) - XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetPixmap()); + XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetDrawable()); } if ((m_currentFill != oldFill) || !GetOptimization()) @@ -2012,18 +2017,18 @@ void wxWindowDC::SetBrush( const wxBrush &brush ) if (m_currentStipple.GetDepth() == 1) { XSetStipple ((Display*) m_display, (GC) m_gc, - (Pixmap) m_currentStipple.GetPixmap()); + (Pixmap) m_currentStipple.GetDrawable()); if (m_window && m_window->GetBackingPixmap()) XSetStipple ((Display*) m_display,(GC) m_gcBacking, - (Pixmap) m_currentStipple.GetPixmap()); + (Pixmap) m_currentStipple.GetDrawable()); } else { XSetTile ((Display*) m_display, (GC) m_gc, - (Pixmap) m_currentStipple.GetPixmap()); + (Pixmap) m_currentStipple.GetDrawable()); if (m_window && m_window->GetBackingPixmap()) XSetTile ((Display*) m_display,(GC) m_gcBacking, - (Pixmap) m_currentStipple.GetPixmap()); + (Pixmap) m_currentStipple.GetDrawable()); } }