added const for Mac OS X compilation

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

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index a56c7b5c49b033b771acc2b887c094a266dd4dfb..3f1d4c83fff5f2706b78ee3ebad63658b544423f 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/src/mac/carbon/dcmemory.cpp
@@ -23,11 +23,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
 wxMemoryDC::wxMemoryDC(void)
 {
 
 wxMemoryDC::wxMemoryDC(void)
 {

+  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_ok = TRUE;
+    SetBackground(*wxWHITE_BRUSH);
+    SetBrush(*wxWHITE_BRUSH);
+    SetPen(*wxBLACK_PEN);

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


@@ -60,7 +68,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
                        {
                                m_macMask = mask->GetMaskBitmap() ;
                        }
                        {
                                m_macMask = mask->GetMaskBitmap() ;
                        }

-                       MacSetupPort() ;

                        m_ok = TRUE ;
                        // SetBackground(wxBrush(*wxWHITE, wxSOLID));
                }
                        m_ok = TRUE ;
                        // SetBackground(wxBrush(*wxWHITE, wxSOLID));
                }


@@ -75,7 +82,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
   };
 };
 
   };
 };
 

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

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