blind OS/2 compilation fix in wxSetWorkingDirectory()

[wxWidgets.git] / src / cocoa / dcmemory.mm

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index bf3920f49e29d76b86ec180bab50194a01dc14d3..b6de98c88050a0f29945dbc116e2d2df4887d822 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -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_ok = false;
 {
     m_cocoaNSImage = NULL;
     m_ok = false;

-
-    if ( bitmap.IsOk() )
-        SelectObject(bitmap);

 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {

-    m_cocoaNSImage = NULL;
-    m_ok = false;
+    Init();

 }
 
 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
 // instead copy the data to an offscreen window, then copy it back
 
 // 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

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap )

 {
     wxAutoNSAutoreleasePool pool;
     if(m_selectedBitmap.Ok())
 {
     wxAutoNSAutoreleasePool pool;
     if(m_selectedBitmap.Ok())