adjusted for new visible region code

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

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index cb9d76d1ab28ca05b8bc687c4d0080cabc5feb5c..bb7008a32d83cf5f7cbf6f91dd603a2b0acb16e3 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -24,6 +24,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 wxBrushRefData::wxBrushRefData()
 {
     m_style = wxSOLID;
 wxBrushRefData::wxBrushRefData()
 {
     m_style = wxSOLID;

+    m_isMacTheme = false ;
+    m_isMacThemeBackground = false ;

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


@@ -31,6 +33,8 @@ 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_isMacTheme = data.m_isMacTheme ;
+  m_macThemeBrush = data.m_macThemeBrush ;

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


@@ -40,14 +44,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)


@@ -58,9 +58,6 @@ 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)
 }
 
 wxBrush::wxBrush(const wxBitmap& stipple)


@@ -71,11 +68,17 @@ wxBrush::wxBrush(const wxBitmap& stipple)
     M_BRUSHDATA->m_stipple = stipple;
 
     RealizeResource();
     M_BRUSHDATA->m_stipple = stipple;
 
     RealizeResource();

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

 }
 
 }
 

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

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


@@ -94,7 +97,8 @@ void wxBrush::Unshare()
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();

-
+    M_BRUSHDATA->m_isMacTheme = false;
+    M_BRUSHDATA->m_isMacThemeBackground = false ;

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


@@ -104,6 +108,8 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
     Unshare();
 
 {
     Unshare();
 

+    M_BRUSHDATA->m_isMacTheme = false;
+    M_BRUSHDATA->m_isMacThemeBackground = false ;

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


@@ -113,6 +119,8 @@ void wxBrush::SetStyle(int Style)
 {
     Unshare();
 
 {
     Unshare();
 

+    M_BRUSHDATA->m_isMacTheme = false;
+    M_BRUSHDATA->m_isMacThemeBackground = false ;

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


@@ -127,6 +135,28 @@ void wxBrush::SetStipple(const wxBitmap& Stipple)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

+void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
+{
+    Unshare();
+
+    M_BRUSHDATA->m_isMacTheme = true;
+    M_BRUSHDATA->m_isMacThemeBackground = false ;
+    M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
+
+    RealizeResource();
+}
+
+void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground)
+{
+    Unshare();
+
+    M_BRUSHDATA->m_isMacTheme = false;
+    M_BRUSHDATA->m_isMacThemeBackground = true ;
+    M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
+
+    RealizeResource();
+}
+

 bool wxBrush::RealizeResource()
 {
     return TRUE;
 bool wxBrush::RealizeResource()
 {
     return TRUE;