X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bce28872ac84d5394a77e62d84c47fa52bbde7a9..e6ba38871f6cc5c02391c04e37e481d0428cef3f:/src/msw/graphics.cpp diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index 15e3bd87d4..a25d643ccd 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" @@ -326,6 +328,7 @@ public: 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(); @@ -1259,7 +1262,9 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) { - 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 ); @@ -1270,6 +1275,8 @@ void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) 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(); @@ -1315,6 +1322,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; @@ -1381,6 +1390,15 @@ wxGraphicsMatrix wxGDIPlusContext::GetTransform() const m_context->GetTransform((Matrix*) matrix.GetNativeMatrix()); return matrix; } + +void wxGDIPlusContext::GetSize( wxDouble* width, wxDouble *height ) +{ + if ( width ) + *width = ::GetDeviceCaps(m_context->GetHDC(), HORZRES); + if ( height ) + *height = ::GetDeviceCaps(m_context->GetHDC(), VERTRES); + +} //----------------------------------------------------------------------------- // wxGDIPlusRenderer declaration //----------------------------------------------------------------------------- @@ -1390,13 +1408,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(); } @@ -1408,6 +1426,8 @@ public : virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc); + virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc); + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ); virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ); @@ -1449,13 +1469,13 @@ public : 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) @@ -1474,20 +1494,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() @@ -1497,45 +1537,52 @@ 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()); +} + +wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxPrinterDC& dc) +{ + ENSURE_LOADED_OR_RETURN(NULL); wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl ); return new wxGDIPlusContext(this,(HDC) msw->GetHDC()); } 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()); } 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() ); } @@ -1543,7 +1590,7 @@ wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window ) wxGraphicsPath wxGDIPlusRenderer::CreatePath() { - EnsureIsLoaded(); + ENSURE_LOADED_OR_RETURN(wxNullGraphicsPath); wxGraphicsPath m; m.SetRefData( new wxGDIPlusPathData(this)); return m; @@ -1556,7 +1603,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 ) ; @@ -1566,7 +1613,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 @@ -1579,7 +1626,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 @@ -1594,7 +1641,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); @@ -1607,7 +1654,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); @@ -1618,7 +1665,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; @@ -1631,7 +1678,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; @@ -1644,7 +1691,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 ) {