X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b823f5a145f4823ce823591824855c34204936e4..419430a0c006cd6830c2c8a768ba850531ec6a18:/include/wx/msw/pen.h

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 7635328dbd..0e4be5f858 100644
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -12,13 +12,15 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "pen.h"
 #endif
 
 #include "wx/gdiobj.h"
+#include "wx/bitmap.h"
+#include "wx/colour.h"
 
-typedef    WXDWORD  wxDash ;
+typedef WXDWORD wxMSWDash;
 
 class WXDLLEXPORT wxPen;
 
@@ -26,9 +28,9 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxPen;
 public:
-    wxPenRefData(void);
+    wxPenRefData();
     wxPenRefData(const wxPenRefData& data);
-    ~wxPenRefData(void);
+    ~wxPenRefData();
 
 protected:
   int           m_width;
@@ -40,33 +42,59 @@ protected:
   wxDash *      m_dash ;
   wxColour      m_colour;
   WXHPEN        m_hPen;
+
+private:
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxPenRefData)
+// because copy constructor is explicitly declared above;
+// but no copy assignment operator is defined, so declare
+// it private to prevent the compiler from defining it:
+    wxPenRefData& operator=(const wxPenRefData&);
 };
 
 #define M_PENDATA ((wxPenRefData *)m_refData)
+#define wxPENDATA(x) ((wxPenRefData *)(x).m_refData)
 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
-  wxPen(void);
-  wxPen(const wxColour& col, int width, int style);
-  wxPen(const wxString& col, int width, int style);
+  wxPen();
+  wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
-  inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }
-  ~wxPen(void);
+  ~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 
+  { 
+      // It is impossible to know if the user dashes have changed, 
+      // so we must assume that they have
+      if ( m_refData && pen.m_refData )
+      {
+          if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
+              return false;
+      }
+      return m_refData == pen.m_refData;
+  }
+  inline bool operator != (const wxPen& pen) const 
+  { 
+      // It is impossible to know if the user dashes have changed, 
+      // so we must assume that they have
+      if ( m_refData && pen.m_refData )
+      {
+          if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
+              return true;
+      }
+      return m_refData != pen.m_refData; 
+  }
 
-  virtual bool Ok(void) const { return (m_refData != NULL) ; }
+  virtual bool Ok() const { return (m_refData != NULL) ; }
 
   // Override in order to recreate the pen
   void SetColour(const wxColour& col) ;
-  void SetColour(const wxString& col)  ;
-  void SetColour(const unsigned char r, const unsigned char g, const unsigned char b)  ;
+  void SetColour(unsigned char r, unsigned char g, unsigned char b);
 
   void SetWidth(int width)  ;
   void SetStyle(int style)  ;
@@ -75,22 +103,24 @@ public:
   void SetJoin(int join)  ;
   void SetCap(int cap)  ;
 
-  inline wxColour& GetColour(void) const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-  inline int GetWidth(void) const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-  inline int GetStyle(void) const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-  inline int GetJoin(void) const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-  inline int GetCap(void) const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
-  inline int GetDashes(wxDash **ptr) const {
-     *ptr = (M_PENDATA ? M_PENDATA->m_dash : NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+  inline wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
+  inline int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
+  inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
+  inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
+  inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
+  inline int GetDashes(wxDash **ptr) const
+  {
+    *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+    return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
   }
 
-  inline wxBitmap *GetStipple(void) const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };
+  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
 
   // Internal
-  bool RealizeResource(void);
+  bool RealizeResource();
   bool FreeResource(bool force = FALSE);
-  WXHANDLE GetResourceHandle(void) ;
-  bool IsFree(void);
+  WXHANDLE GetResourceHandle() const;
+  bool IsFree() const;
   void Unshare();
 };