void wxDC::DFBInit(const wxIDirectFBSurfacePtr& surface)
{
m_ok = (surface != NULL);
- wxCHECK_RET( surface != NULL, _T("invalid surface") );
+ wxCHECK_RET( surface != NULL, "invalid surface" );
m_surface = surface;
wxSize size(GetSize());
wxASSERT_MSG( !m_clipping,
- _T("narrowing clipping region not implemented yet") );
+ "narrowing clipping region not implemented yet" );
// NB: We intersect the clipping rectangle with surface's area here because
// DirectFB will return an error if you try to set clipping rectangle
bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
- wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel"));
+ wxCHECK_MSG( col, false, "NULL colour parameter in wxDC::GetPixel");
- wxFAIL_MSG( _T("GetPixel not implemented") );
+ wxFAIL_MSG( "GetPixel not implemented" );
return false;
}
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("CrossHair not implemented") );
+ wxFAIL_MSG( "CrossHair not implemented" );
}
void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("DrawArc not implemented") );
+ wxFAIL_MSG( "DrawArc not implemented" );
}
void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("DrawPolygon not implemented") );
+ wxFAIL_MSG( "DrawPolygon not implemented" );
}
void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
wxCHECK_RET( Ok(), wxT("invalid dc") );
// TODO: impl. using DirectDB's DrawLines
- wxFAIL_MSG( _T("DrawLines not implemented") );
+ wxFAIL_MSG( "DrawLines not implemented" );
}
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("DrawRoundedRectangle not implemented") );
+ wxFAIL_MSG( "DrawRoundedRectangle not implemented" );
}
void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("DrawElipse not implemented") );
+ wxFAIL_MSG( "DrawElipse not implemented" );
}
void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("DrawElipticArc not implemented") );
+ wxFAIL_MSG( "DrawElipticArc not implemented" );
}
void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
wxCHECK_RET( m_textForegroundColour.Ok(),
wxT("invalid foreground color") );
SelectColour(m_textForegroundColour);
- m_surface->DrawString(wxSTR_TO_DFB(text), -1, xx, yy, DSTF_LEFT | DSTF_TOP);
+ m_surface->DrawString(text.utf8_str(), -1, xx, yy, DSTF_LEFT | DSTF_TOP);
// restore pen's colour, because other drawing functions expect the colour
// to be set to the pen:
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("DrawRotatedText not implemented") );
+ wxFAIL_MSG( "DrawRotatedText not implemented" );
}
// ---------------------------------------------------------------------------
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
- wxFAIL_MSG( _T("SetPalette not implemented") );
+ wxFAIL_MSG( "SetPalette not implemented" );
}
#endif // wxUSE_PALETTE
// NB: we could also support XOR, but for blitting only (via DSBLIT_XOR);
// and possibly others via SetSrc/DstBlendFunction()
wxASSERT_MSG( function == wxCOPY,
- _T("only wxCOPY logical function supported") );
+ "only wxCOPY logical function supported" );
m_logicalFunction = function;
}
DFBRectangle rect;
wxIDirectFBFontPtr f = GetCurrentFont();
- if ( f->GetStringExtents(wxSTR_TO_DFB(string), -1, &rect, NULL) )
+ if ( f->GetStringExtents(string.utf8_str(), -1, &rect, NULL) )
{
// VS: YDEV is corrent, it should *not* be XDEV, because font's are
// only scaled according to m_scaleY
// mapping modes
// ---------------------------------------------------------------------------
-void wxDC::ComputeScaleAndOrigin()
-{
- m_scaleX = m_logicalScaleX * m_userScaleX;
- m_scaleY = m_logicalScaleY * m_userScaleY;
-
- // FIXME_DFB: scaling affects pixel size of font, pens, brushes, which
- // is not currently implemented here; probably makes sense to
- // switch to Cairo instead of implementing everything for DFB
- wxASSERT_MSG( m_scaleX == 1.0 && m_scaleY == 1.0,
- _T("scaling is not implemented in wxDFB") );
-}
-
-void wxDC::SetMapMode(int mode)
-{
- #warning "move this to common code, it's shared by almost all ports!"
- switch (mode)
- {
- case wxMM_TWIPS:
- SetLogicalScale(twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y);
- break;
- case wxMM_POINTS:
- SetLogicalScale(pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y);
- break;
- case wxMM_METRIC:
- SetLogicalScale(m_mm_to_pix_x, m_mm_to_pix_y);
- break;
- case wxMM_LOMETRIC:
- SetLogicalScale(m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0);
- break;
- default:
- case wxMM_TEXT:
- SetLogicalScale(1.0, 1.0);
- break;
- }
- m_mappingMode = mode;
-}
-
-void wxDC::SetUserScale(double x, double y)
-{
- #warning "move this to common code?"
- // allow negative ? -> no
- m_userScaleX = x;
- m_userScaleY = y;
- ComputeScaleAndOrigin();
-}
-
-void wxDC::SetLogicalScale(double x, double y)
-{
- #warning "move this to common code?"
- // allow negative ?
- m_logicalScaleX = x;
- m_logicalScaleY = y;
- ComputeScaleAndOrigin();
-}
-
-void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
- #warning "move this to common code?"
- m_logicalOriginX = x * m_signX; // is this still correct ?
- m_logicalOriginY = y * m_signY;
- ComputeScaleAndOrigin();
-}
-
-void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
- #warning "move this to common code?"
- // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
- m_deviceOriginX = x;
- m_deviceOriginY = y;
- ComputeScaleAndOrigin();
-}
-
-void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
- #warning "move this to common code?"
- // only wxPostScripDC has m_signX = -1, we override SetAxisOrientation there
- m_signX = (xLeftRight ? 1 : -1);
- m_signY = (yBottomUp ? -1 : 1);
- ComputeScaleAndOrigin();
-}
-
-// ---------------------------------------------------------------------------
-// coordinates transformations
-// ---------------------------------------------------------------------------
-
-wxCoord wxDC::DeviceToLogicalX(wxCoord x) const
-{
- return XDEV2LOG(x);
-}
-
-wxCoord wxDC::DeviceToLogicalY(wxCoord y) const
-{
- return YDEV2LOG(y);
-}
-
-wxCoord wxDC::DeviceToLogicalXRel(wxCoord x) const
-{
- return XDEV2LOGREL(x);
-}
-
-wxCoord wxDC::DeviceToLogicalYRel(wxCoord y) const
-{
- return YDEV2LOGREL(y);
-}
-
-wxCoord wxDC::LogicalToDeviceX(wxCoord x) const
-{
- return XLOG2DEV(x);
-}
-
-wxCoord wxDC::LogicalToDeviceY(wxCoord y) const
-{
- return YLOG2DEV(y);
-}
-
-wxCoord wxDC::LogicalToDeviceXRel(wxCoord x) const
-{
- return XLOG2DEVREL(x);
-}
-
-wxCoord wxDC::LogicalToDeviceYRel(wxCoord y) const
-{
- return YLOG2DEVREL(y);
-}
-
-
+// FIXME_DFB: scaling affects pixel size of font, pens, brushes, which
+// is not currently implemented here; probably makes sense to
+// switch to Cairo instead of implementing everything for DFB
+
void wxDC::DoGetSize(int *w, int *h) const
{
wxCHECK_RET( Ok(), wxT("invalid dc") );
int rop, bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask)
{
- wxCHECK_MSG( Ok(), false, _T("invalid dc") );
- wxCHECK_MSG( source, false, _T("invalid source dc") );
+ wxCHECK_MSG( Ok(), false, "invalid dc" );
+ wxCHECK_MSG( source, false, "invalid source dc" );
// NB: we could also support XOR here (via DSBLIT_XOR)
// and possibly others via SetSrc/DstBlendFunction()
- wxCHECK_MSG( rop == wxCOPY, false, _T("only wxCOPY function supported") );
+ wxCHECK_MSG( rop == wxCOPY, false, "only wxCOPY function supported" );
// transform the source DC coords to the device ones
xsrc = source->LogicalToDeviceX(xsrc);
// FIXME_DFB: use the mask origin when drawing transparently
wxASSERT_MSG( xsrcMask == -1 && ysrcMask == -1,
- _T("non-default source mask offset not implemented") );
+ "non-default source mask offset not implemented" );
#if 0
if (xsrcMask == -1 && ysrcMask == -1)
{
// NB: we could also support XOR here (via DSBLIT_XOR)
// and possibly others via SetSrc/DstBlendFunction()
- wxCHECK_RET( rop == wxCOPY, _T("only wxCOPY function supported") );
+ wxCHECK_RET( rop == wxCOPY, "only wxCOPY function supported" );
if ( bmp.GetDepth() == 1 )
{
// Mono bitmaps are handled in special way -- all 1s are drawn in
// foreground colours, all 0s in background colour.
- wxFAIL_MSG( _T("drawing mono bitmaps not implemented") );
+ wxFAIL_MSG( "drawing mono bitmaps not implemented" );
return;
}
// applicable because DirectFB doesn't implement ROPs; OTOH,
// it has blitting modes that can be useful; finally, see
// DFB's SetSrcBlendFunction() and SetSrcColorKey()
- wxFAIL_MSG( _T("drawing bitmaps with masks not implemented") );
+ wxFAIL_MSG( "drawing bitmaps with masks not implemented" );
return;
}
src->GetSize(&srcsize.x, &srcsize.y);
if ( !wxRect(srcx, srcy, w, h).Intersects(wxRect(srcsize)) )
{
- wxLogDebug(_T("Blitting from area outside of the source surface, caller code needs fixing."));
+ wxLogDebug("Blitting from area outside of the source surface, caller code needs fixing.");
return false;
}
wxIDirectFBSurfacePtr dst(m_surface);
// FIXME: this will have to be different in useMask case, see above
- if ( !dst->SetBlittingFlags(DSBLIT_NOFX) )
+ DFBSurfaceBlittingFlags blitFlag = (src->GetPixelFormat() == DSPF_ARGB)
+ ? DSBLIT_BLEND_ALPHACHANNEL
+ : DSBLIT_NOFX;
+ if ( !dst->SetBlittingFlags(blitFlag) )
return false;
if ( srcRect.w != dstRect.w || srcRect.h != dstRect.h )
projects / wxWidgets.git / blobdiff