quickdraw fixes

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index bb06309b127253618ab8abe9d36bf2e6196556d3..bc776fb9dd8a7d1d55f5b7af5b9fcaf16c3a99b1 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -48,11 +48,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 #include "wx/tabctrl.h"
 
 
-static wxBrush MacGetBackgroundBrush( wxWindow* window )
-{
-    wxBrush bkdBrush = window->MacGetBackgroundBrush() ;
-    return bkdBrush ;
-}
 
 wxWindowDC::wxWindowDC()
 {
@@ -89,7 +84,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     }
     SetClippingRegion( 0 , 0 , m_width , m_height ) ;
 
-    SetBackground(MacGetBackgroundBrush(window));
+    SetBackground(wxBrush(window->GetBackgroundColour(),wxSOLID));
 
     SetFont( window->GetFont() ) ;
 }
@@ -120,10 +115,13 @@ wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
     if (!m_window)
         return wxNullBitmap;
 
+#ifdef __LP64__
+    return wxNullBitmap;
+#else
     ControlRef handle = (ControlRef) m_window->GetHandle();
     if ( !handle )
         return wxNullBitmap;
-
+    
     HIRect rect;
     CGImageRef image;
     CGContextRef context;
@@ -166,6 +164,7 @@ wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
     }
 
     return bmp;
+#endif
 }
 
 /*