Menu label consistency changes

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

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 36703d2cc70343537d8755f084eef1aece56a8e7..74e83ebd7753ebe5bfb11563fce675985a89e5e9 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -1,35 +1,72 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/mac/carbon/brush.cpp

 // Purpose:     wxBrush
 // Purpose:     wxBrush

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/setup.h"
-#include "wx/utils.h"

 #include "wx/brush.h"
 
 #include "wx/brush.h"
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"

 #endif
 
 #endif
 

+#include "wx/mac/private.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
+
+class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+{
+    friend class WXDLLEXPORT wxBrush;
+
+public:
+    wxBrushRefData();
+    wxBrushRefData(const wxBrushRefData& data);
+    virtual ~wxBrushRefData();
+
+    bool operator == ( const wxBrushRefData& brush ) const
+    {
+        return m_style == brush.m_style &&
+                m_stipple.IsSameAs(brush.m_stipple) &&
+                m_colour == brush.m_colour &&
+                m_macBrushKind == brush.m_macBrushKind &&
+                m_macThemeBrush == brush.m_macThemeBrush &&
+                m_macThemeBackground == brush.m_macThemeBackground &&
+                EqualRect(&m_macThemeBackgroundExtent, &brush.m_macThemeBackgroundExtent);
+    }
+
+
+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()
 wxBrushRefData::wxBrushRefData()

+    : m_style(wxSOLID)

 {
 {

-    m_style = wxSOLID;

     m_macBrushKind = kwxMacBrushColour ;
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
     m_macBrushKind = kwxMacBrushColour ;
 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)

+    : wxGDIRefData()
+    , m_style(data.m_style)

 {
 {

-  m_style = data.m_style;

   m_stipple = data.m_stipple;
   m_colour = data.m_colour;
   m_macBrushKind = data.m_macBrushKind ;
   m_stipple = data.m_stipple;
   m_colour = data.m_colour;
   m_macBrushKind = data.m_macBrushKind ;


@@ -42,7 +79,6 @@ wxBrushRefData::~wxBrushRefData()
 {
 }
 
 {
 }
 

-// Brushes

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


@@ -65,13 +101,18 @@ wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData;
 
 {
     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();
 }
 

-wxBrush::wxBrush(ThemeBrush macThemeBrush ) 
+wxBrush::wxBrush( ThemeBrush macThemeBrush )

 {
     m_refData = new wxBrushRefData;
 
 {
     m_refData = new wxBrushRefData;
 


@@ -80,19 +121,20 @@ wxBrush::wxBrush(ThemeBrush macThemeBrush )
 
     RealizeResource();
 }
 
     RealizeResource();
 }

+

 void wxBrush::Unshare()
 {
 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
     {
     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)
 }
 
 void wxBrush::SetColour(const wxColour& col)


@@ -134,42 +176,81 @@ void wxBrush::SetStipple(const wxBitmap& Stipple)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxBrush::SetMacTheme(ThemeBrush macThemeBrush)
+void wxBrush::MacSetTheme(ThemeBrush macThemeBrush)

 {
     Unshare();
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
 {
     Unshare();
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 

+    RGBColor color ;
+    GetThemeBrushAsColor( macThemeBrush , 32, true, &color );
+    M_BRUSHDATA->m_colour = color;
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxBrush::SetMacThemeBackground(ThemeBackgroundKind macThemeBackground, const Rect &extent)
+void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRECTPTR extent)

 {
     Unshare();
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
 {
     Unshare();
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;

-    M_BRUSHDATA->m_macThemeBackgroundExtent = extent ;
+    M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)extent;
+

     RealizeResource();
 }
 
 bool wxBrush::RealizeResource()
 {
     RealizeResource();
 }
 
 bool wxBrush::RealizeResource()
 {

-    return TRUE;
+    return true;
+}
+
+unsigned long wxBrush::MacGetThemeBackground(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::MacGetTheme() 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);

 }
 
 }
 

-ThemeBackgroundKind wxBrush::GetMacThemeBackground(Rect *extent)  const 
+wxBitmap *wxBrush::GetStipple() const

 {
 {

-  if ( M_BRUSHDATA && M_BRUSHDATA->m_macBrushKind == kwxMacBrushThemeBackground )
-  {
-    if ( extent )
-      *extent = M_BRUSHDATA->m_macThemeBackgroundExtent ;
-    return M_BRUSHDATA->m_macThemeBackground ;
-  }
-  else
-  {
-    return 0 ;  
-  }
+    return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0);

 }
 
 }
 

+wxMacBrushKind wxBrush::MacGetBrushKind() const
+{
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
+}
+
+bool wxBrush::operator == ( const wxBrush& brush ) const
+{
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+}