adapting ownership semantics to cocoa convention

[wxWidgets.git] / src / os2 / dcmemory.cpp

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index d4d5ec937cb7321b0db4d1a9d577543ea486c539..64acc9f90dadbba6274f1228b2bfa35fcb02ec32 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -29,25 +29,25 @@ IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl)
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
         : wxPMDCImpl( owner )
 {
-    CreateCompatible(NULL); 
-    Init(); 
+    CreateCompatible(NULL);
+    Init();
 }
 
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) 
-        : wxPMDCImpl( owner ) 
-{ 
-    CreateCompatible(NULL); 
-    Init(); 
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxPMDCImpl( owner )
+{
+    CreateCompatible(NULL);
+    Init();
     DoSelect(bitmap);
 }
 
 wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)
-        : wxPMDCImpl( owner ) 
+        : wxPMDCImpl( owner )
 {
-    wxCHECK_RET( pOldDC, _T("NULL dc in wxMemoryDC ctor") );
+    wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") );
 
     CreateCompatible(pOldDC);
     Init();
@@ -139,7 +139,7 @@ void wxMemoryDCImpl::DoSelect(
     if (m_hOldBitmap)
     {
         ::GpiSetBitmap(m_hPS, NULLHANDLE);
-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())
         {
             m_vSelectedBitmap.SetSelectedInto(NULL);
             m_vSelectedBitmap = wxNullBitmap;
@@ -201,7 +201,7 @@ void wxMemoryDCImpl::DoGetSize(
 , int*                              pHeight
 ) const
 {
-    if (!m_vSelectedBitmap.Ok())
+    if (!m_vSelectedBitmap.IsOk())
     {
         *pWidth  = 0;
         *pHeight = 0;