Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include wx/dcclient.h to declare wxWindowDC (blind fix for buildbot compilation error)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-22 21:54:45 +00:00
parent 1950edc304
commit b02d434010
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/dcgraph.cpp
View File

@@ -28,9 +28,12 @@
#include "wx/region.h" #include "wx/region.h"
#endif #endif
#include "wx/dcclient.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#include "wx/mac/private.h" #include "wx/mac/private.h"
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// constants // constants
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -154,7 +157,7 @@ void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool W
{ {
m_graphicContext->SetPen(*wxTRANSPARENT_PEN); m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) ); 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->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() ); m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush)); m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
@@ -175,12 +178,12 @@ void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
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) )
{ {
return true; return true;
} }
void wxGCDCImpl::EndDoc() void wxGCDCImpl::EndDoc()
{ {
} }
@@ -188,10 +191,10 @@ void wxGCDCImpl::StartPage()
{ {
} }
void wxGCDCImpl::EndPage() void wxGCDCImpl::EndPage()
{ {
} }
void wxGCDCImpl::Flush() void wxGCDCImpl::Flush()
{ {
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -266,7 +269,7 @@ void wxGCDCImpl::DestroyClippingRegion()
int width, height ; int width, height ;
GetOwner()->GetSize( &width , &height ) ; GetOwner()->GetSize( &width , &height ) ;
m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) ); m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
m_graphicContext->SetPen( m_pen ); m_graphicContext->SetPen( m_pen );
m_graphicContext->SetBrush( m_brush ); m_graphicContext->SetBrush( m_brush );
@@ -342,7 +345,7 @@ int wxGCDCImpl::GetDepth() const
} }
void wxGCDCImpl::ComputeScaleAndOrigin() void wxGCDCImpl::ComputeScaleAndOrigin()
{ {
wxDCImpl::ComputeScaleAndOrigin(); wxDCImpl::ComputeScaleAndOrigin();
if ( m_graphicContext ) if ( m_graphicContext )
@@ -403,7 +406,7 @@ void wxGCDCImpl::SetBrush( const wxBrush &brush )
m_graphicContext->SetBrush( m_brush ); m_graphicContext->SetBrush( m_brush );
} }
} }
void wxGCDCImpl::SetBackground( const wxBrush &brush ) void wxGCDCImpl::SetBackground( const wxBrush &brush )
{ {
if (m_backgroundBrush == brush) if (m_backgroundBrush == brush)
@@ -787,7 +790,7 @@ bool wxGCDCImpl::DoStretchBlit(
if ( logical_func == wxNO_OP ) if ( logical_func == wxNO_OP )
return true; return true;
else if ( !m_graphicContext->SetLogicalFunction( logical_func ) ) else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
{ {
wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") ); wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
return false; return false;