X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dcbbdcf92041ccf3efbc3bc2909d1dd0b7d0364..4b04699b670b4ab4632229fa0264d154acd3bec1:/src/mac/brush.cpp?ds=inline

diff --git a/src/mac/brush.cpp b/src/mac/brush.cpp
index bb7008a32d..f38b3782d9 100644
--- a/src/mac/brush.cpp
+++ b/src/mac/brush.cpp
@@ -17,15 +17,38 @@
 #include "wx/utils.h"
 #include "wx/brush.h"
 
+#include "wx/mac/private.h"
+
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 #endif
 
+class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+{
+    friend class WXDLLEXPORT wxBrush;
+public:
+    wxBrushRefData();
+    wxBrushRefData(const wxBrushRefData& data);
+    ~wxBrushRefData();
+
+protected:
+    wxMacBrushKind m_macBrushKind ;
+    int           m_style;
+    wxBitmap      m_stipple ;
+    wxColour      m_colour;
+    
+    ThemeBrush    m_macThemeBrush ;
+    
+    ThemeBackgroundKind m_macThemeBackground ;
+    Rect         m_macThemeBackgroundExtent ;
+};
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+
 wxBrushRefData::wxBrushRefData()
 {
     m_style = wxSOLID;
-    m_isMacTheme = false ;
-    m_isMacThemeBackground = false ;
+    m_macBrushKind = kwxMacBrushColour ;
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
@@ -33,8 +56,10 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
   m_style = data.m_style;
   m_stipple = data.m_stipple;
   m_colour = data.m_colour;
-  m_isMacTheme = data.m_isMacTheme ;
+  m_macBrushKind = data.m_macBrushKind ;
   m_macThemeBrush = data.m_macThemeBrush ;
+  m_macThemeBackground = data.m_macThemeBackground ;
+  m_macThemeBackgroundExtent = data.m_macThemeBackgroundExtent ;
 }
 
 wxBrushRefData::~wxBrushRefData()
@@ -64,8 +89,13 @@ wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;
 
-    M_BRUSHDATA->m_style = wxSTIPPLE;
+    M_BRUSHDATA->m_colour = *wxBLACK;
     M_BRUSHDATA->m_stipple = stipple;
+    
+    if (M_BRUSHDATA->m_stipple.GetMask())
+        M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
+    else
+        M_BRUSHDATA->m_style = wxSTIPPLE;
 
     RealizeResource();
 }
@@ -74,7 +104,7 @@ wxBrush::wxBrush(ThemeBrush macThemeBrush )
 {
     m_refData = new wxBrushRefData;
 
-    M_BRUSHDATA->m_isMacTheme = true;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     RealizeResource();
@@ -97,8 +127,7 @@ void wxBrush::Unshare()
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
     M_BRUSHDATA->m_colour = col;
 
     RealizeResource();
@@ -108,8 +137,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
 
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
     M_BRUSHDATA->m_colour.Set(r, g, b);
 
     RealizeResource();
@@ -119,8 +147,7 @@ void wxBrush::SetStyle(int Style)
 {
     Unshare();
 
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
     M_BRUSHDATA->m_style = Style;
 
     RealizeResource();
@@ -130,6 +157,7 @@ void wxBrush::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
 
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;
     M_BRUSHDATA->m_stipple = Stipple;
 
     RealizeResource();
@@ -139,21 +167,19 @@ void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
 {
     Unshare();
 
-    M_BRUSHDATA->m_isMacTheme = true;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     RealizeResource();
 }
 
-void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground)
+void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)
 {
     Unshare();
 
-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = true ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
-
+    M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent ;
     RealizeResource();
 }
 
@@ -162,3 +188,39 @@ bool wxBrush::RealizeResource()
     return TRUE;
 }
 
+unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent)  const 
+{
+  if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
+  {
+    if ( extent )
+      *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
+    return M_BRUSHDATA->m_macThemeBackground ;
+  }
+  else
+  {
+    return 0 ;  
+  }
+}
+
+short wxBrush::GetMacTheme()  const 
+{ 
+  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); };
+
+int wxBrush::GetStyle() const 
+{ 
+  return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); 
+};
+
+wxBitmap *wxBrush::GetStipple() const 
+{ 
+  return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); 
+};
+
+wxMacBrushKind wxBrush::MacGetBrushKind()  const 
+{ 
+  return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); 
+};