ATSU Support in font extended

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

diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index bb7008a32d83cf5f7cbf6f91dd603a2b0acb16e3..8716a58535dddac547765d5c5a092234dc171384 100644 (file)
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -1,40 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        brush.cpp
 // Purpose:     wxBrush
 /////////////////////////////////////////////////////////////////////////////
 // Name:        brush.cpp
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "brush.h"
 #endif
 
 #pragma implementation "brush.h"
 #endif
 

-#include "wx/setup.h"
+#include "wx/wxprec.h"
+

 #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)
 #endif
 
 #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()
 wxBrushRefData::wxBrushRefData()

+    : m_style(wxSOLID)

 {
 {

-    m_style = wxSOLID;
-    m_isMacTheme = false ;
-    m_isMacThemeBackground = false ;
+    m_macBrushKind = kwxMacBrushColour ;

 }
 
 wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
 }
 
 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_stipple = data.m_stipple;
   m_colour = data.m_colour;

-  m_isMacTheme = data.m_isMacTheme ;
+  m_macBrushKind = data.m_macBrushKind ;

   m_macThemeBrush = data.m_macThemeBrush ;
   m_macThemeBrush = data.m_macThemeBrush ;

+  m_macThemeBackground = data.m_macThemeBackground ;
+  m_macThemeBackgroundExtent = data.m_macThemeBackgroundExtent ;

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


@@ -64,8 +91,13 @@ 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();
 }


@@ -74,31 +106,30 @@ wxBrush::wxBrush(ThemeBrush macThemeBrush )
 {
     m_refData = new wxBrushRefData;
 
 {
     m_refData = new wxBrushRefData;
 

-    M_BRUSHDATA->m_isMacTheme = true;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;

     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     RealizeResource();
 }
 void wxBrush::Unshare()
 {
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     RealizeResource();
 }
 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)
 {
     Unshare();
 }
 
 void wxBrush::SetColour(const wxColour& col)
 {
     Unshare();

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

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


@@ -108,8 +139,7 @@ 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_macBrushKind = kwxMacBrushColour;

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


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

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

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


@@ -130,30 +159,29 @@ 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)
+void wxBrush::MacSetTheme(ThemeBrush macThemeBrush)

 {
     Unshare();
 
 {
     Unshare();
 

-    M_BRUSHDATA->m_isMacTheme = true;
-    M_BRUSHDATA->m_isMacThemeBackground = false ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushTheme;

     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     RealizeResource();
 }
 
     M_BRUSHDATA->m_macThemeBrush = macThemeBrush;
 
     RealizeResource();
 }
 

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

 {
     Unshare();
 
 {
     Unshare();
 

-    M_BRUSHDATA->m_isMacTheme = false;
-    M_BRUSHDATA->m_isMacThemeBackground = true ;
+    M_BRUSHDATA->m_macBrushKind = kwxMacBrushThemeBackground;

     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;
     M_BRUSHDATA->m_macThemeBackground = macThemeBackground;

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

     RealizeResource();
 }
 
     RealizeResource();
 }
 


@@ -162,3 +190,41 @@ 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); 
+}
+
+wxBitmap *wxBrush::GetStipple() const 
+{ 
+    return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); 
+}
+
+wxMacBrushKind wxBrush::MacGetBrushKind()  const 
+{ 
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour); 
+}