Back to previous call with -1 replacement.

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

diff --git a/src/mac/classic/brush.cpp b/src/mac/classic/brush.cpp
index d484314a2ce98af507fea1e9621cdd950f9ff496..a848d256ddb503b23beada89157159f8b1bd7366 100644 (file)
--- a/src/mac/classic/brush.cpp
+++ b/src/mac/classic/brush.cpp
@@ -1,27 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/mac/classic/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

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

-#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"
 

+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
+

 #include "wx/mac/private.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
 {
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {


@@ -29,16 +27,16 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);
 public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);

-    ~wxBrushRefData();
+    virtual ~wxBrushRefData();

 
 protected:
     wxMacBrushKind m_macBrushKind ;
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;
 
 protected:
     wxMacBrushKind m_macBrushKind ;
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;

-    
+

     ThemeBrush    m_macThemeBrush ;
     ThemeBrush    m_macThemeBrush ;

-    
+

     ThemeBackgroundKind m_macThemeBackground ;
     Rect         m_macThemeBackgroundExtent ;
 };
     ThemeBackgroundKind m_macThemeBackground ;
     Rect         m_macThemeBackgroundExtent ;
 };


@@ -92,7 +90,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


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

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

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


@@ -186,44 +184,44 @@ void wxBrush::SetMacThemeBackground(unsigned long macThemeBackground, const WXRE
 
 bool wxBrush::RealizeResource()
 {
 
 bool wxBrush::RealizeResource()
 {

-    return TRUE;
+    return true;

 }
 
 }
 

-unsigned long wxBrush::GetMacThemeBackground( WXRECTPTR extent)  const 
+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 ;  
-  }
+    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); 
+short wxBrush::GetMacTheme() 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); 
-}
\ No newline at end of file
+wxMacBrushKind wxBrush::MacGetBrushKind()  const
+{
+    return (M_BRUSHDATA ? M_BRUSHDATA->m_macBrushKind : kwxMacBrushColour);
+}