X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/brush.cpp?ds=sidebyside

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index ba06a370e2..789be90f00 100644
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -1,19 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        brush.cpp
 // Purpose:     wxBrush
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "brush.h"
 #endif
 
-#include "wx/setup.h"
+#include "wx/wxprec.h"
+
 #include "wx/utils.h"
 #include "wx/brush.h"
 
@@ -112,17 +113,17 @@ wxBrush::wxBrush(ThemeBrush macThemeBrush )
 }
 void wxBrush::Unshare()
 {
-	// Don't change shared data
-	if (!m_refData)
+    // Don't change shared data
+    if (!m_refData)
     {
-		m_refData = new wxBrushRefData();
-	}
+        m_refData = new wxBrushRefData();
+    }
     else
     {
-		wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
-		UnRef();
-		m_refData = ref;
-	}
+        wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 void wxBrush::SetColour(const wxColour& col)
@@ -164,17 +165,20 @@ void wxBrush::SetStipple(const wxBitmap& Stipple)
     RealizeResource();
 }
 
-void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
+void wxBrush::MacSetTheme(ThemeBrush macThemeBrush)
 {
     Unshare();
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
-
+    RGBColor color ;
+    GetThemeBrushAsColor( macThemeBrush , 32, true, &color );
+    M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 ) ;
+    
     RealizeResource();
 }
 
-void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)
+void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)
 {
     Unshare();
 
@@ -189,7 +193,7 @@ bool wxBrush::RealizeResource()
     return TRUE;
 }
 
-unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent)  const 
+unsigned long wxBrush::MacGetThemeBackground( WXRECTPTR extent)  const 
 {
   if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
   {
@@ -203,25 +207,27 @@ unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent)  const
   }
 }
 
-short wxBrush::GetMacTheme()  const 
+short wxBrush::MacGetTheme() const 
 { 
-  return (M_BRUSHDATA ? ( M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack); 
-};
+    return (M_BRUSHDATA ? ( M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack); 
+}
 
 wxColour& wxBrush::GetColour() const 
-{ return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
+{
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour);
+}
 
 int wxBrush::GetStyle() const 
 { 
-  return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); 
-};
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); 
+}
 
 wxBitmap *wxBrush::GetStipple() const 
 { 
-  return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); 
-};
+    return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); 
+}
 
 wxMacBrushKind wxBrush::MacGetBrushKind()  const 
 { 
-  return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); 
-};
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); 
+}