need wxUSE_WCHAR_T around wxConvLocal

[wxWidgets.git] / src / mac / brush.cpp

diff --git a/src/mac/brush.cpp b/src/mac/brush.cpp
index 36703d2cc70343537d8755f084eef1aece56a8e7..f38b3782d99053c54a6c0a7b0229d34d1a096616 100644 (file)
--- a/src/mac/brush.cpp
+++ b/src/mac/brush.cpp
@@ -17,10 +17,34 @@
 #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;
@@ -65,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();
 }
@@ -144,13 +173,13 @@ void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
     RealizeResource();
 }
 
-void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground, const Rect &extent)
+void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)
 {
     Unshare();
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
-    M_BRUSHDATA->m_macThemeBackgroundExtent = extent ;
+    M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent ;
     RealizeResource();
 }
 
@@ -159,12 +188,12 @@ bool wxBrush::RealizeResource()
     return TRUE;
 }
 
-ThemeBackgroundKind wxBrush::GetMacThemeBackground(Rect *extent)  const 
+unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent)  const 
 {
   if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
   {
     if ( extent )
-      *extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
+      *(Rect*)extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
     return M_BRUSHDATA->m_macThemeBackground ;
   }
   else
@@ -173,3 +202,25 @@ ThemeBackgroundKind wxBrush::GetMacThemeBackground(Rect *extent)  const
   }
 }
 
+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); 
+};