Move wxMulDivInt32 to common math.

[wxWidgets.git] / include / wx / mac / carbon / pen.h

diff --git a/include/wx/mac/carbon/pen.h b/include/wx/mac/carbon/pen.h
index db2d4ebc539b1793c908934ec5e0f3795497a937..1a3ea6b8fd61c204d71bbb3356afdf32767ad15b 100644 (file)
--- a/include/wx/mac/carbon/pen.h
+++ b/include/wx/mac/carbon/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/pen.h
+// Name:        wx/mac/carbon/pen.h

 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxPen class
 // Author:      Stefan Csomor
 // Modified by:


@@ -58,14 +58,14 @@ public:
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }

-  inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; }
-  inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; }
+  inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
+  inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }

 
   virtual bool Ok() const { return (m_refData != NULL) ; }
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
 
   virtual bool Ok() const { return (m_refData != NULL) ; }
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;

-  void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+  void SetColour(unsigned char r, unsigned char g, unsigned char b) ;

 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;
 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;