renamed wxWave to wxSound

[wxWidgets.git] / include / wx / msw / pen.h

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 1cf0f4266c75628145af086ad177df60b272fde4..95f7186b05bbf3e560d3d1d630344272aad93553 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -12,12 +12,13 @@
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
 #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"
 #pragma interface "pen.h"
 #endif
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"

+#include "wx/colour.h"

 
 typedef WXDWORD wxMSWDash;
 
 
 typedef WXDWORD wxMSWDash;
 


@@ -38,12 +39,21 @@ protected:
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;
   int           m_cap ;
   wxBitmap      m_stipple ;
   int           m_nbDash ;

-  wxMSWDash *   m_dash ;
+  wxDash *      m_dash ;

   wxColour      m_colour;
   WXHPEN        m_hPen;
   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 M_PENDATA ((wxPenRefData *)m_refData)

+#define wxPENDATA(x) ((wxPenRefData *)(x).m_refData)

 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject


@@ -51,14 +61,34 @@ class WXDLLEXPORT wxPen: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   wxPen();
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   wxPen();

-  wxPen(const wxColour& col, int width, int style);
+  wxPen(const wxColour& col, int width = 1, int style = wxSOLID);

   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
   wxPen(const wxBitmap& stipple, int width);
   inline wxPen(const wxPen& pen) { Ref(pen); }
   ~wxPen();
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }

-  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; }
+  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() const { return (m_refData != NULL) ; }
 
 
   virtual bool Ok() const { return (m_refData != NULL) ; }
 


@@ -83,13 +113,15 @@ public:
     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
     return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
   }
     *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
     return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
   }

+  wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
+  inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };

 
   inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
 
   // Internal
   bool RealizeResource();
   bool FreeResource(bool force = FALSE);
 
   inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
 
   // Internal
   bool RealizeResource();
   bool FreeResource(bool force = FALSE);

-  WXHANDLE GetResourceHandle() ;
+  WXHANDLE GetResourceHandle() const;

   bool IsFree() const;
   void Unshare();
 };
   bool IsFree() const;
   void Unshare();
 };