AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleaning up, adding support for Quartz / Themeing before 10.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2005-02-19 15:34:35 +00:00
parent 4a63451be5
commit a8f234d2a9
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/dccg.cpp
View File

@ -105,6 +105,20 @@ wxMacWindowStateSaver::~wxMacWindowStateSaver()
SetThemeDrawingState( m_themeDrawingState , true ) ; SetThemeDrawingState( m_themeDrawingState , true ) ;
} }
// minimal implementation only used for appearance drawing < 10.3
wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
m_ph( (GrafPtr) dc->m_macPort )
{
wxASSERT( dc->Ok() ) ;
m_dc = dc ;
// dc->MacSetupPort(&m_ph) ;
}
wxMacPortSetter::~wxMacPortSetter()
{
// m_dc->MacCleanupPort(&m_ph) ;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Local functions // Local functions
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1228,7 +1242,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
} }
wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source) ; wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source) ;
if ( memdc ) if ( memdc && logical_func == wxCOPY )
{ {
wxBitmap blit = memdc->GetSelectedObject() ; wxBitmap blit = memdc->GetSelectedObject() ;
wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ; wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ;
@ -1256,7 +1270,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
} }
else else
{ {
wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ; return FALSE ; // wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") ) ;
} }
return TRUE; return TRUE;
} }