Fix wxListCtrl background colour bug Part I

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

diff --git a/src/mac/brush.cpp b/src/mac/brush.cpp
index 7ba6dfc99063c4114ad0a246184f4c896fb2c394..f38b3782d99053c54a6c0a7b0229d34d1a096616 100644 (file)
--- a/src/mac/brush.cpp
+++ b/src/mac/brush.cpp
@@ -17,11 +17,38 @@
 #include "wx/utils.h"
 #include "wx/brush.h"
 
 #include "wx/utils.h"
 #include "wx/brush.h"
 

+#include "wx/mac/private.h"
+
+#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 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;
 
 wxBrushRefData::wxBrushRefData()
 {
     m_style = wxSOLID;

+    m_macBrushKind = kwxMacBrushColour ;

 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)


@@ -29,6 +56,10 @@ wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
   m_style = data.m_style;
   m_stipple = data.m_stipple;
   m_colour = data.m_colour;
   m_style = data.m_style;
   m_stipple = data.m_stipple;
   m_colour = data.m_colour;

+  m_macBrushKind = data.m_macBrushKind ;
+  m_macThemeBrush = data.m_macThemeBrush ;
+  m_macThemeBackground = data.m_macThemeBackground ;
+  m_macThemeBackgroundExtent = data.m_macThemeBackgroundExtent ;

 }
 
 wxBrushRefData::~wxBrushRefData()
 }
 
 wxBrushRefData::~wxBrushRefData()


@@ -38,14 +69,10 @@ wxBrushRefData::~wxBrushRefData()
 // Brushes
 wxBrush::wxBrush()
 {
 // Brushes
 wxBrush::wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 }
 
 wxBrush::~wxBrush()
 {
 }
 
 wxBrush::~wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->RemoveBrush(this);

 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)
 }
 
 wxBrush::wxBrush(const wxColour& col, int Style)


@@ -56,24 +83,32 @@ wxBrush::wxBrush(const wxColour& col, int Style)
     M_BRUSHDATA->m_style = Style;
 
     RealizeResource();
     M_BRUSHDATA->m_style = Style;
 
     RealizeResource();

-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;
 
 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;
 

-    M_BRUSHDATA->m_style = wxSTIPPLE;
+    M_BRUSHDATA->m_colour = *wxBLACK;

     M_BRUSHDATA->m_stipple = stipple;
     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();
 
     RealizeResource();

-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 }
 
 }
 

+wxBrush::wxBrush(ThemeBrush macThemeBrush ) 
+{
+    m_refData = new wxBrushRefData;
+
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
+    M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
+
+    RealizeResource();
+}

 void wxBrush::Unshare()
 {
        // Don't change shared data
 void wxBrush::Unshare()
 {
        // Don't change shared data


@@ -92,7 +127,7 @@ void wxBrush::Unshare()
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();

-
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;

     M_BRUSHDATA->m_colour = col;
 
     RealizeResource();
     M_BRUSHDATA->m_colour = col;
 
     RealizeResource();


@@ -102,6 +137,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
 
 {
     Unshare();
 

+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;

     M_BRUSHDATA->m_colour.Set(r, g, b);
 
     RealizeResource();
     M_BRUSHDATA->m_colour.Set(r, g, b);
 
     RealizeResource();


@@ -111,6 +147,7 @@ void wxBrush::SetStyle(int Style)
 {
     Unshare();
 
 {
     Unshare();
 

+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;

     M_BRUSHDATA->m_style = Style;
 
     RealizeResource();
     M_BRUSHDATA->m_style = Style;
 
     RealizeResource();


@@ -120,13 +157,70 @@ void wxBrush::SetStipple(const wxBitmap& Stipple)
 {
     Unshare();
 
 {
     Unshare();
 

+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushColour;

     M_BRUSHDATA->m_stipple = Stipple;
 
     RealizeResource();
 }
 
     M_BRUSHDATA->m_stipple = Stipple;
 
     RealizeResource();
 }
 

+void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
+{
+    Unshare();
+
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
+    M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
+
+    RealizeResource();
+}
+
+void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)
+{
+    Unshare();
+
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
+    M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
+    M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent ;
+    RealizeResource();
+}
+

 bool wxBrush::RealizeResource()
 {
     return TRUE;
 }
 
 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); 
+};