X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fff14c955917fb4a141c7a47ed0712b9fa30f33..763163a80ae0d5a0684633e72f928302578c1214:/src/msw/graphics.cpp diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index d824659040..210f3e0f9f 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -279,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(); @@ -323,7 +323,6 @@ 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; @@ -334,18 +333,26 @@ 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() @@ -664,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; @@ -1022,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(); } @@ -1035,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(); } @@ -1056,6 +1068,8 @@ void wxGDIPlusContext::Init() m_context = NULL; m_state1 = 0; m_state2= 0; + m_height = 0; + m_width = 0; } void wxGDIPlusContext::SetDefaults() @@ -1228,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) { @@ -1260,16 +1274,31 @@ 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) { - wxCHECK_RET( !m_font.IsNull(), wxT("wxGDIPlusContext::DrawText - no valid font set") ); + 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, @@ -1308,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 ) ; @@ -1343,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 ; @@ -1355,7 +1384,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble } bool wxGDIPlusContext::ShouldOffset() const -{ +{ int penwidth = 0 ; if ( !m_pen.IsNull() ) { @@ -1393,13 +1422,8 @@ wxGraphicsMatrix wxGDIPlusContext::GetTransform() const void wxGDIPlusContext::GetSize( wxDouble* width, wxDouble *height ) { - HDC hdc = m_context->GetHDC(); - if ( width ) - *width = ::GetDeviceCaps(hdc, HORZRES); - if ( height ) - *height = ::GetDeviceCaps(hdc, VERTRES); - m_context->ReleaseHDC(hdc); - + *width = m_width; + *height = m_height; } //----------------------------------------------------------------------------- // wxGDIPlusRenderer declaration @@ -1429,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 ); @@ -1466,7 +1490,7 @@ 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 ); @@ -1546,21 +1570,24 @@ wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc) { 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) { 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) { 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()