git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50911
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
#include "wx/region.h"
#endif
#include "wx/region.h"
#endif
+#include "wx/dcclient.h"
+
#ifdef __WXMAC__
#include "wx/mac/private.h"
#endif
#ifdef __WXMAC__
#include "wx/mac/private.h"
#endif
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
{
m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );
{
m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );
- m_graphicContext->DrawRectangle( x , y , bmp.GetWidth() , bmp.GetHeight() );
+ m_graphicContext->DrawRectangle( x , y , bmp.GetWidth() , bmp.GetHeight() );
m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
m_graphicContext->DrawIcon( icon , x, y, w, h );
}
m_graphicContext->DrawIcon( icon , x, y, w, h );
}
-bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) )
+bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) )
-void wxGCDCImpl::EndDoc()
+void wxGCDCImpl::EndDoc()
-void wxGCDCImpl::EndPage()
+void wxGCDCImpl::EndPage()
void wxGCDCImpl::Flush()
{
#ifdef __WXMAC__
void wxGCDCImpl::Flush()
{
#ifdef __WXMAC__
int width, height ;
GetOwner()->GetSize( &width , &height ) ;
m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
int width, height ;
GetOwner()->GetSize( &width , &height ) ;
m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
m_graphicContext->SetPen( m_pen );
m_graphicContext->SetBrush( m_brush );
m_graphicContext->SetPen( m_pen );
m_graphicContext->SetBrush( m_brush );
}
void wxGCDCImpl::ComputeScaleAndOrigin()
}
void wxGCDCImpl::ComputeScaleAndOrigin()
wxDCImpl::ComputeScaleAndOrigin();
if ( m_graphicContext )
wxDCImpl::ComputeScaleAndOrigin();
if ( m_graphicContext )
m_graphicContext->SetBrush( m_brush );
}
}
m_graphicContext->SetBrush( m_brush );
}
}
void wxGCDCImpl::SetBackground( const wxBrush &brush )
{
if (m_backgroundBrush == brush)
void wxGCDCImpl::SetBackground( const wxBrush &brush )
{
if (m_backgroundBrush == brush)
if ( logical_func == wxNO_OP )
return true;
else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
if ( logical_func == wxNO_OP )
return true;
else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
{
wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
return false;
{
wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
return false;