Implemented Mac-style button toggling within wxButtonToolBar, and line

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

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 878a38ce0562790b200a5ea3465161c11756e8db..ae77b03b209ff5de6c2d287b2af20f4e9b73ae20 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxBrush
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxBrush
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -21,6 +21,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxBrush;
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxBrush;

+

 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);


@@ -31,15 +32,16 @@ protected:
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;

-    
+

     ThemeBrush    m_macThemeBrush ;
     ThemeBrush    m_macThemeBrush ;

-    
+

     ThemeBackgroundKind m_macThemeBackground ;
     Rect         m_macThemeBackgroundExtent ;
 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 
     ThemeBackgroundKind m_macThemeBackground ;
     Rect         m_macThemeBackgroundExtent ;
 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 

+

 wxBrushRefData::wxBrushRefData()
     : m_style(wxSOLID)
 {
 wxBrushRefData::wxBrushRefData()
     : m_style(wxSOLID)
 {


@@ -62,7 +64,6 @@ wxBrushRefData::~wxBrushRefData()
 {
 }
 
 {
 }
 

-// Brushes

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


@@ -87,7 +88,7 @@ wxBrush::wxBrush(const wxBitmap& stipple)
 
     M_BRUSHDATA->m_colour = *wxBLACK;
     M_BRUSHDATA->m_stipple = stipple;
 
     M_BRUSHDATA->m_colour = *wxBLACK;
     M_BRUSHDATA->m_stipple = stipple;

-    
+

     if (M_BRUSHDATA->m_stipple.GetMask())
         M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
     else
     if (M_BRUSHDATA->m_stipple.GetMask())
         M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
     else


@@ -96,7 +97,7 @@ wxBrush::wxBrush(const wxBitmap& stipple)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

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

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


@@ -105,6 +106,7 @@ wxBrush::wxBrush(ThemeBrush macThemeBrush )
 
     RealizeResource();
 }
 
     RealizeResource();
 }

+

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


@@ -165,10 +167,11 @@ void wxBrush::MacSetTheme(ThemeBrush macThemeBrush)
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;

+

     RGBColor color ;
     GetThemeBrushAsColor( macThemeBrush , 32, true, &color );
     RGBColor color ;
     GetThemeBrushAsColor( macThemeBrush , 32, true, &color );

-    M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 ) ;
-    
+    M_BRUSHDATA->m_colour.Set( color.red >> 8 , color.green >> 8 , color.blue >> 8 );
+

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -178,50 +181,53 @@ void wxBrush::MacSetThemeBackground(unsigned long macThemeBackground, const WXRE
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
 
     M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;

-    M_BRUSHDATA->m_macThemeBackgroundExtent = *(Rect*)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 
+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 ;  
-  }
+    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); 
+short wxBrush::MacGetTheme() const
+{
+    return (M_BRUSHDATA ? ((M_BRUSHDATA->m_macBrushKind == kwxMacBrushTheme) ? M_BRUSHDATA->m_macThemeBrush : kThemeBrushBlack) : kThemeBrushBlack);

 }
 
 }
 

-wxColour& wxBrush::GetColour() const 
+wxColour& wxBrush::GetColour() const

 {
     return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour);
 }
 
 {
     return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour);
 }
 

-int wxBrush::GetStyle() const 
-{ 
-    return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); 
+int wxBrush::GetStyle() const
+{
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0);

 }
 
 }
 

-wxBitmap *wxBrush::GetStipple() const 
-{ 
-    return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 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); 
+wxMacBrushKind wxBrush::MacGetBrushKind() const
+{
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);

 }
 }

+