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

compilation fix after wxMemoryDCBase changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-31 00:14:50 +00:00
parent 76690d5e7d
commit 64dd1c4697
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cocoa/dcmemory.mm
View File

@@ -30,19 +30,15 @@
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC) IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC)
wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap ) void wxMemoryDC::Init()
{ {
m_cocoaNSImage = NULL; m_cocoaNSImage = NULL;
m_ok = false; m_ok = false;
if ( bitmap.IsOk() )
SelectObject(bitmap);
} }
wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
{ {
m_cocoaNSImage = NULL; Init();
m_ok = false;
} }
wxMemoryDC::~wxMemoryDC(void) wxMemoryDC::~wxMemoryDC(void)
@@ -75,7 +71,7 @@ bool wxMemoryDC::CocoaUnlockFocus()
// NOTE: The AppKit is unable to draw onto an NSBitmapImageRep so we must // NOTE: The AppKit is unable to draw onto an NSBitmapImageRep so we must
// instead copy the data to an offscreen window, then copy it back // instead copy the data to an offscreen window, then copy it back
void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) void wxMemoryDC::DoSelect( const wxBitmap& bitmap )
{ {
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
if(m_selectedBitmap.Ok()) if(m_selectedBitmap.Ok())