remove pict support for 64bit

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 1784856fdfd29cf15069bd8c7b5c7bbc282d48f4..e4d51d52a0ef8417cb033a6aced078ae37edc250 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -924,8 +924,6 @@ void wxWindowMac::Init()
     m_hScrollBarAlwaysShown = false;
     m_vScrollBarAlwaysShown = false;
 
     m_hScrollBarAlwaysShown = false;
     m_vScrollBarAlwaysShown = false;
 

-    m_macBackgroundBrush = wxNullBrush ;
-

     m_macIsUserPane = true;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;
     m_macIsUserPane = true;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;


@@ -1200,28 +1198,11 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 
     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 

-    wxBrush brush ;
-    wxColour newCol(GetBackgroundColour());
-
-    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )
-        brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
-    else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
-        brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
-    else
-        brush.SetColour( newCol ) ;
-
-    MacSetBackgroundBrush( brush ) ;
-    MacUpdateControlFont() ;
+    m_peer->SetBackgroundColour( col ) ;

 
     return true ;
 }
 
 
     return true ;
 }
 

-void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
-{
-    m_macBackgroundBrush = brush ;
-    m_peer->SetBackground( brush ) ;
-}
-

 bool wxWindowMac::MacCanFocus() const
 {
     // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so
 bool wxWindowMac::MacCanFocus() const
 {
     // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so


@@ -2315,8 +2296,7 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
         return ;
 
 #if TARGET_API_MAC_OSX
         return ;
 
 #if TARGET_API_MAC_OSX

-    if ( !m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT
-         || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
+    if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )

     {
         event.Skip() ;
     }
     {
         event.Skip() ;
     }


@@ -2441,10 +2421,9 @@ void  wxWindowMac::MacPaintGrowBox()
         CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
         CGContextSaveGState( cgContext );
         
         CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
         CGContextSaveGState( cgContext );
         

-        if ( m_macBackgroundBrush.Ok() && m_macBackgroundBrush.GetStyle() != wxTRANSPARENT )
+        if ( m_backgroundColour.Ok() )

         {
         {

-            wxMacCoreGraphicsColour bkgnd( m_macBackgroundBrush ) ;
-            bkgnd.Apply( cgContext );
+            CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() ); 

         }
         else
         {
         }
         else
         {