Ok, so we don't need the extra bool at all, we can just zero the sizer

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

diff --git a/src/mac/dcmemory.cpp b/src/mac/dcmemory.cpp
index 3f1d4c83fff5f2706b78ee3ebad63658b544423f..5e3f603ce8c0d7ce3efd3ae1ae29b8cb3f75494b 100644 (file)
--- a/src/mac/dcmemory.cpp
+++ b/src/mac/dcmemory.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/dcmemory.h"
+#include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
@@ -22,6 +23,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)
+    : m_selected()
 {
   m_ok = TRUE;
     SetBackground(*wxWHITE_BRUSH);
@@ -31,20 +33,20 @@ wxMemoryDC::wxMemoryDC(void)
 };
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+    : m_selected()
 {
- m_ok = TRUE;
+  m_ok = TRUE;
     SetBackground(*wxWHITE_BRUSH);
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
   m_ok = FALSE;
 };
 
-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDC::~wxMemoryDC()
 {
        if ( m_selected.Ok() )
        {
-               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
-               UnlockPixels( GetGWorldPixMap(  (CGrafPtr) bmap->m_hBitmap ) ) ;
+               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
        }
 };
 
@@ -52,35 +54,34 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
        if ( m_selected.Ok() )
        {
-               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
-               UnlockPixels( GetGWorldPixMap(  (CGrafPtr) bmap->m_hBitmap ) ) ;
+               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
        }
-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
-               if ( bmap->m_hBitmap )
+    m_selected = bitmap;
+    if (m_selected.Ok())
+    {
+               if ( m_selected.GetHBITMAP() )
                {
-                       m_macPort = (GrafPtr) bmap->m_hBitmap ;
+                       m_macPort = (GrafPtr) m_selected.GetHBITMAP() ;
                        LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
                        wxMask * mask = bitmap.GetMask() ;
                        if ( mask )
                        {
                                m_macMask = mask->GetMaskBitmap() ;
                        }
+               SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
+               CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
                        m_ok = TRUE ;
-                       // SetBackground(wxBrush(*wxWHITE, wxSOLID));
                }
                else
                {
-           m_ok = FALSE;
+               m_ok = FALSE;
                }
   }
   else
   {
     m_ok = FALSE;
-  };
-};
+  }
+}
 
 void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
@@ -93,7 +94,7 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
-  };
-};
+  }
+}