return Color(col.Alpha(), col.Red(), col.Green(), col.Blue());
}
+// Do not use this pointer directly, it's only used by
+// GetDrawTextStringFormat() and the cleanup code in wxGDIPlusRendererModule.
+StringFormat* gs_drawTextStringFormat = NULL;
+
+// Get the string format used for the text drawing and measuring functions:
+// notice that it must be the same one for all of them, otherwise the drawn
+// text might be of different size than what measuring it returned.
+inline StringFormat* GetDrawTextStringFormat()
+{
+ if ( !gs_drawTextStringFormat )
+ {
+ gs_drawTextStringFormat = new StringFormat(StringFormat::GenericTypographic());
+
+ // This doesn't make any difference for DrawText() actually but we want
+ // this behaviour when measuring text.
+ gs_drawTextStringFormat->SetFormatFlags
+ (
+ gs_drawTextStringFormat->GetFormatFlags()
+ | StringFormatFlagsMeasureTrailingSpaces
+ );
+ }
+
+ return gs_drawTextStringFormat;
+}
+
} // anonymous namespace
//-----------------------------------------------------------------------------
GraphicsPath* m_brushPath;
};
-class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsBitmapData
{
public:
wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap );
~wxGDIPlusBitmapData ();
virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; }
+ virtual void* GetNativeBitmap() const { return m_bitmap; }
#if wxUSE_IMAGE
wxImage ConvertToImage() const;
// stroke lines connecting each of the points
virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
+ // We don't have any specific implementation for this one in wxMSW but
+ // override it just to avoid warnings about hiding the base class virtual.
+ virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
+ {
+ wxGraphicsContext::StrokeLines(n, beginPoints, endPoints);
+ }
+
// draws a polygon
virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
void Init(Graphics* graphics, int width, int height);
private:
- virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y)
- { DoDrawFilledText(str, x, y, wxNullGraphicsBrush); }
- virtual void DoDrawFilledText(const wxString& str, wxDouble x, wxDouble y,
- const wxGraphicsBrush& backgroundBrush);
+ virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y);
Graphics* m_context;
wxStack<GraphicsState> m_stateStack;
//-----------------------------------------------------------------------------
wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ) :
- wxGraphicsObjectRefData( renderer ), m_bitmap( bitmap )
+ wxGraphicsBitmapData( renderer ), m_bitmap( bitmap )
{
m_helper = NULL;
}
wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer,
- const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer )
+ const wxBitmap &bmp) : wxGraphicsBitmapData( renderer )
{
m_bitmap = NULL;
m_helper = NULL;
if (m_interpolation == interpolation)
return true;
- m_interpolation = interpolation;
-
InterpolationMode interpolationMode = InterpolationModeDefault;
switch (interpolation)
{
default:
return false;
}
- m_context->SetInterpolationMode(interpolationMode);
+
+ if ( m_context->SetInterpolationMode(interpolationMode) != Gdiplus::Ok )
+ return false;
+
+ m_interpolation = interpolation;
+
return true;
}
DeleteObject(iconInfo.hbmMask);
}
-void wxGDIPlusContext::DoDrawFilledText(const wxString& str,
- wxDouble x, wxDouble y,
- const wxGraphicsBrush& brush)
+void wxGDIPlusContext::DoDrawText(const wxString& str,
+ wxDouble x, wxDouble y )
{
if (m_composition == wxCOMPOSITION_DEST)
return;
wxGDIPlusFontData * const
fontData = (wxGDIPlusFontData *)m_font.GetRefData();
- wxGDIPlusBrushData * const
- brushData = (wxGDIPlusBrushData *)brush.GetRefData();
-
+
m_context->DrawString
(
str.wc_str(*wxConvUI), // string to draw, always Unicode
-1, // length: string is NUL-terminated
fontData->GetGDIPlusFont(),
PointF(x, y),
- StringFormat::GenericTypographic(),
- brushData ? brushData->GetGDIPlusBrush()
- : fontData->GetGDIPlusBrush()
+ GetDrawTextStringFormat(),
+ fontData->GetGDIPlusBrush()
);
}
REAL factorY = m_fontScaleRatio;
- REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) *
- f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
- REAL rAscent = ffamily.GetCellAscent(FontStyleRegular) *
- f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
- REAL rHeight = ffamily.GetLineSpacing(FontStyleRegular) *
- f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+ // Notice that we must use the real font style or the results would be
+ // incorrect for italic/bold fonts.
+ const INT style = f->GetStyle();
+ const REAL size = f->GetSize();
+ const REAL emHeight = ffamily.GetEmHeight(style);
+ REAL rDescent = ffamily.GetCellDescent(style) * size / emHeight;
+ REAL rAscent = ffamily.GetCellAscent(style) * size / emHeight;
+ REAL rHeight = ffamily.GetLineSpacing(style) * size / emHeight;
if ( height )
*height = rHeight * factorY;
else
{
RectF layoutRect(0,0, 100000.0f, 100000.0f);
- StringFormat strFormat( StringFormat::GenericTypographic() );
- strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
RectF bounds ;
- m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ;
+ m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, GetDrawTextStringFormat(), &bounds ) ;
if ( width )
*width = bounds.Width;
if ( height )
wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
RectF layoutRect(0,0, 100000.0f, 100000.0f);
- StringFormat strFormat( StringFormat::GenericTypographic() );
+ StringFormat strFormat( GetDrawTextStringFormat() );
size_t startPosition = 0;
size_t remainder = len;
ranges[i].Length = startPosition+i+1 ;
}
strFormat.SetMeasurableCharacterRanges(span,ranges);
- strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,span,regions) ;
RectF bbox ;
class wxGDIPlusRendererModule : public wxModule
{
public:
+ wxGDIPlusRendererModule()
+ {
+ // We must be uninitialized before GDI+ DLL itself is unloaded.
+ AddDependency("wxGdiPlusModule");
+ }
+
virtual bool OnInit() { return true; }
- virtual void OnExit() { gs_GDIPlusRenderer.Unload(); }
+ virtual void OnExit()
+ {
+ wxDELETE(gs_drawTextStringFormat);
+
+ gs_GDIPlusRenderer.Unload();
+ }
private:
DECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule)
projects / wxWidgets.git / blobdiff