Added global skope too FinControl()

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

diff --git a/src/mac/dcmemory.cpp b/src/mac/dcmemory.cpp
index a56c7b5c49b033b771acc2b887c094a266dd4dfb..5e3f603ce8c0d7ce3efd3ae1ae29b8cb3f75494b 100644 (file)
--- a/src/mac/dcmemory.cpp
+++ b/src/mac/dcmemory.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/dcmemory.h"
 #endif
 
 #include "wx/dcmemory.h"

+#include "wx/mac/private.h"

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC


@@ -22,21 +23,30 @@
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)

+    : m_selected()

 {
 {

+  m_ok = TRUE;
+    SetBackground(*wxWHITE_BRUSH);
+    SetBrush(*wxWHITE_BRUSH);
+    SetPen(*wxBLACK_PEN);

   m_ok = FALSE;
 };
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   m_ok = FALSE;
 };
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

+    : m_selected()

 {
 {

+  m_ok = TRUE;
+    SetBackground(*wxWHITE_BRUSH);
+    SetBrush(*wxWHITE_BRUSH);
+    SetPen(*wxBLACK_PEN);

   m_ok = FALSE;
 };
 
   m_ok = FALSE;
 };
 

-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDC::~wxMemoryDC()

 {
        if ( m_selected.Ok() )
        {
 {
        if ( m_selected.Ok() )
        {

-               wxBitmapRefData * bmap = (wxBitmapRefData*) (m_selected.GetRefData()) ;
-               UnlockPixels( GetGWorldPixMap(  (CGrafPtr) bmap->m_hBitmap ) ) ;
+               UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );

        }
 };
 
        }
 };
 


@@ -44,38 +54,36 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
        if ( m_selected.Ok() )
        {
 {
        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() ;
                        }
                        LockPixels( GetGWorldPixMap(  (CGrafPtr)  m_macPort ) ) ;
                        wxMask * mask = bitmap.GetMask() ;
                        if ( mask )
                        {
                                m_macMask = mask->GetMaskBitmap() ;
                        }

-                       MacSetupPort() ;
+               SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
+               CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;

                        m_ok = TRUE ;
                        m_ok = TRUE ;

-                       // SetBackground(wxBrush(*wxWHITE, wxSOLID));

                }
                else
                {
                }
                else
                {

-           m_ok = FALSE;
+               m_ok = FALSE;

                }
   }
   else
   {
     m_ok = FALSE;
                }
   }
   else
   {
     m_ok = FALSE;

-  };
-};
+  }
+}

 
 

-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::DoGetSize( int *width, int *height ) const

 {
   if (m_selected.Ok())
   {
 {
   if (m_selected.Ok())
   {


@@ -86,7 +94,7 @@ void wxMemoryDC::GetSize( int *width, int *height ) const
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;

-  };
-};
+  }
+}