X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b822969a677939811d9fb966177031fb5fc625b..fcdd53359135f790b85728c4254b97095a56dad8:/src/msw/graphics.cpp diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index e2b875612a..210f3e0f9f 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -23,16 +23,18 @@ #include "wx/msw/wrapcdlg.h" #include "wx/image.h" #include "wx/window.h" - #include "wx/dc.h" #include "wx/utils.h" #include "wx/dialog.h" #include "wx/app.h" #include "wx/bitmap.h" - #include "wx/dcmemory.h" #include "wx/log.h" #include "wx/icon.h" - #include "wx/dcprint.h" #include "wx/module.h" + // include all dc types that are used as a param + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/dcprint.h" #endif #include "wx/private/graphics.h" @@ -277,7 +279,7 @@ private : class wxGDIPlusContext : public wxGraphicsContext { public: - wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc ); + wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc , wxDouble width, wxDouble height ); wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd ); wxGDIPlusContext( wxGraphicsRenderer* renderer, Graphics* gr); wxGDIPlusContext(); @@ -321,28 +323,36 @@ public: virtual void PushState(); virtual void PopState(); - virtual void DrawText( const wxString &str, wxDouble x, wxDouble y); virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, wxDouble *descent, wxDouble *externalLeading ) const; virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const; virtual bool ShouldOffset() const; + virtual void GetSize( wxDouble* width, wxDouble *height ); private: void Init(); void SetDefaults(); + 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); + Graphics* m_context; GraphicsStates m_stateStack; GraphicsState m_state1; GraphicsState m_state2; + wxDouble m_width; + wxDouble m_height; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext) }; class WXDLLIMPEXP_CORE wxGDIPlusMeasuringContext : public wxGDIPlusContext { public: - wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL) ) + wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL), 1000, 1000 ) { } wxGDIPlusMeasuringContext() @@ -661,7 +671,7 @@ wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* m_helper = NULL; } -wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, +wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer ) { m_bitmap = NULL; @@ -1019,11 +1029,13 @@ public : bool m_offset; } ; -wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc ) +wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc, wxDouble width, wxDouble height ) : wxGraphicsContext(renderer) { Init(); m_context = new Graphics( hdc); + m_width = width; + m_height = height; SetDefaults(); } @@ -1032,6 +1044,9 @@ wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd ) { Init(); m_context = new Graphics( hwnd); + RECT rect = wxGetWindowRect(hwnd); + m_width = rect.right - rect.left; + m_height = rect.bottom - rect.top; SetDefaults(); } @@ -1053,6 +1068,8 @@ void wxGDIPlusContext::Init() m_context = NULL; m_state1 = 0; m_state2= 0; + m_height = 0; + m_width = 0; } void wxGDIPlusContext::SetDefaults() @@ -1225,7 +1242,7 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD interim.LockBits(&bounds, ImageLockModeRead, interim.GetPixelFormat(),&data); - + bool hasAlpha = false; for ( size_t y = 0 ; y < height && !hasAlpha ; ++y) { @@ -1257,19 +1274,38 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD DeleteObject(iconInfo.hbmMask); } -void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) +void wxGDIPlusContext::DoDrawFilledText(const wxString& str, + wxDouble x, wxDouble y, + const wxGraphicsBrush& brush) { - if ( m_font.IsNull() || str.IsEmpty()) + wxCHECK_RET( !m_font.IsNull(), + wxT("wxGDIPlusContext::DrawText - no valid font set") ); + + if ( str.IsEmpty()) return ; - wxWCharBuffer s = str.wc_str( *wxConvUI ); - m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() , - PointF( x , y ) , StringFormat::GenericTypographic() , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() ); + 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() + ); } void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height, wxDouble *descent, wxDouble *externalLeading ) const { + wxCHECK_RET( !m_font.IsNull(), wxT("wxGDIPlusContext::GetTextExtent - no valid font set") ); + wxWCharBuffer s = str.wc_str( *wxConvUI ); FontFamily ffamily ; Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont(); @@ -1301,7 +1337,7 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo { RectF layoutRect(0,0, 100000.0f, 100000.0f); StringFormat strFormat( StringFormat::GenericTypographic() ); - strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); + strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); RectF bounds ; m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ; @@ -1315,6 +1351,8 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble widths.Empty(); widths.Add(0, text.length()); + wxCHECK_RET( !m_font.IsNull(), wxT("wxGDIPlusContext::GetPartialTextExtents - no valid font set") ); + if (text.empty()) return; @@ -1334,7 +1372,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble ranges[i].Length = 1 ; } strFormat.SetMeasurableCharacterRanges(len,ranges); - strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); + strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ; RectF bbox ; @@ -1346,7 +1384,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble } bool wxGDIPlusContext::ShouldOffset() const -{ +{ int penwidth = 0 ; if ( !m_pen.IsNull() ) { @@ -1381,6 +1419,12 @@ wxGraphicsMatrix wxGDIPlusContext::GetTransform() const m_context->GetTransform((Matrix*) matrix.GetNativeMatrix()); return matrix; } + +void wxGDIPlusContext::GetSize( wxDouble* width, wxDouble *height ) +{ + *width = m_width; + *height = m_height; +} //----------------------------------------------------------------------------- // wxGDIPlusRenderer declaration //----------------------------------------------------------------------------- @@ -1390,13 +1434,13 @@ class wxGDIPlusRenderer : public wxGraphicsRenderer public : wxGDIPlusRenderer() { - m_loaded = false; + m_loaded = -1; m_gditoken = 0; } virtual ~wxGDIPlusRenderer() { - if (m_loaded) + if ( m_loaded == 1 ) { Unload(); } @@ -1409,7 +1453,7 @@ public : virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc); - + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); @@ -1446,18 +1490,18 @@ public : // create a native bitmap representation virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ); - + // create a subimage from a native image representation virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ); protected : - void EnsureIsLoaded(); + bool EnsureIsLoaded(); void Load(); void Unload(); friend class wxGDIPlusRendererModule; private : - bool m_loaded; + int m_loaded; ULONG_PTR m_gditoken; DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer) @@ -1476,20 +1520,40 @@ wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() return &gs_GDIPlusRenderer; } -void wxGDIPlusRenderer::EnsureIsLoaded() +bool wxGDIPlusRenderer::EnsureIsLoaded() { - if (!m_loaded) + // load gdiplus.dll if not yet loaded, but don't bother doing it again + // if we already tried and failed (we don't want to spend lot of time + // returning NULL from wxGraphicsContext::Create(), which may be called + // relatively frequently): + if ( m_loaded == -1 ) { Load(); } + + return m_loaded == 1; } +// call EnsureIsLoaded() and return returnOnFail value if it fails +#define ENSURE_LOADED_OR_RETURN(returnOnFail) \ + if ( !EnsureIsLoaded() ) \ + return (returnOnFail) + + void wxGDIPlusRenderer::Load() { GdiplusStartupInput input; GdiplusStartupOutput output; - GdiplusStartup(&m_gditoken,&input,&output); - m_loaded = true; + if ( GdiplusStartup(&m_gditoken,&input,&output) == Gdiplus::Ok ) + { + wxLogTrace("gdiplus", "successfully initialized GDI+"); + m_loaded = 1; + } + else + { + wxLogTrace("gdiplus", "failed to initialize GDI+, missing gdiplus.dll?"); + m_loaded = 0; + } } void wxGDIPlusRenderer::Unload() @@ -1499,52 +1563,55 @@ void wxGDIPlusRenderer::Unload() GdiplusShutdown(m_gditoken); m_gditoken = NULL; } - m_loaded = false; + m_loaded = -1; // next Load() will try again } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); - return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); + wxSize sz = dc.GetSize(); + return new wxGDIPlusContext(this,(HDC) msw->GetHDC(), sz.x, sz.y); } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxPrinterDC& dc) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); - return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); + wxSize sz = dc.GetSize(); + return new wxGDIPlusContext(this,(HDC) msw->GetHDC(), sz.x, sz.y); } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxMemoryDC& dc) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); - return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); + wxSize sz = dc.GetSize(); + return new wxGDIPlusContext(this,(HDC) msw->GetHDC(), sz.x, sz.y); } wxGraphicsContext * wxGDIPlusRenderer::CreateMeasuringContext() { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusMeasuringContext(this); } wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusContext(this,(Graphics*) context); } wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeWindow( void * window ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusContext(this,(HWND) window); } wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(NULL); return new wxGDIPlusContext(this, (HWND) window->GetHWND() ); } @@ -1552,7 +1619,7 @@ wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window ) wxGraphicsPath wxGDIPlusRenderer::CreatePath() { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPath); wxGraphicsPath m; m.SetRefData( new wxGDIPlusPathData(this)); return m; @@ -1565,7 +1632,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub wxDouble tx, wxDouble ty) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsMatrix); wxGraphicsMatrix m; wxGDIPlusMatrixData* data = new wxGDIPlusMatrixData( this ); data->Set( a,b,c,d,tx,ty ) ; @@ -1575,7 +1642,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen); if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT ) return wxNullGraphicsPen; else @@ -1588,7 +1655,7 @@ wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT ) return wxNullGraphicsBrush; else @@ -1603,7 +1670,7 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); wxGraphicsBrush p; wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this ); d->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2); @@ -1616,7 +1683,7 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDou wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, const wxColour &oColor, const wxColour &cColor) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush); wxGraphicsBrush p; wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this ); d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor); @@ -1627,7 +1694,7 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDou // sets the font wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont); if ( font.Ok() ) { wxGraphicsFont p; @@ -1640,7 +1707,7 @@ wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColou wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); if ( bitmap.Ok() ) { wxGraphicsBitmap p; @@ -1653,7 +1720,7 @@ wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap ) wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap); Bitmap* image = static_cast(bitmap.GetRefData())->GetGDIPlusBitmap(); if ( image ) {