wxMenu::Append (and similar) now return a pointer to the wxMenuItem

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 9604745a00e68eee947b9f8d26541fbe540e0728..95f7186b05bbf3e560d3d1d630344272aad93553 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -5,20 +5,22 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

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

-#ifndef __PENH__
-#define __PENH__
+#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"
 #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;
 
 
 class WXDLLEXPORT wxPen;
 


@@ -26,8 +28,9 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxPen;
 public:
 {
     friend class WXDLLEXPORT wxPen;
 public:

-    wxPenRefData(void);
-    ~wxPenRefData(void);
+    wxPenRefData();
+    wxPenRefData(const wxPenRefData& data);
+    ~wxPenRefData();

 
 protected:
   int           m_width;
 
 protected:
   int           m_width;


@@ -39,60 +42,91 @@ protected:
   wxDash *      m_dash ;
   wxColour      m_colour;
   WXHPEN        m_hPen;
   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 M_PENDATA ((wxPenRefData *)m_refData)

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

 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
 
 // Pen
 class WXDLLEXPORT wxPen: public wxGDIObject
 {
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:

-  wxPen(void);
-  wxPen(const wxColour& col, const int width, const int style);
-  wxPen(const wxString& col, const int width, const int style);
-  wxPen(const wxBitmap& stipple, const int width);
+  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) { Ref(pen); }

-  inline wxPen(const wxPen* pen) { /* UnRef(); */ if (pen) Ref(*pen); }
-  ~wxPen(void);
+  ~wxPen();

 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
 
   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) ;
 
   // 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(const int width)  ;
-  void SetStyle(const int style)  ;
+  void SetWidth(int width)  ;
+  void SetStyle(int style)  ;

   void SetStipple(const wxBitmap& stipple)  ;
   void SetStipple(const wxBitmap& stipple)  ;

-  void SetDashes(const int nb_dashes, const wxDash *dash)  ;
-  void SetJoin(const int join)  ;
-  void SetCap(const 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);
+  void SetDashes(int nb_dashes, const wxDash *dash)  ;
+  void SetJoin(int join)  ;
+  void SetCap(int cap)  ;
+
+  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);

   }
   }

+  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(void) const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };
+  inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

 
   // Internal
 
   // Internal

-  bool RealizeResource(void);
+  bool RealizeResource();

   bool FreeResource(bool force = FALSE);
   bool FreeResource(bool force = FALSE);

-  WXHANDLE GetResourceHandle(void) ;
-  bool IsFree(void);
+  WXHANDLE GetResourceHandle() const;
+  bool IsFree() const;
+  void Unshare();

 };
 
 int wx2msPenStyle(int wx_style);
 
 #endif
 };
 
 int wx2msPenStyle(int wx_style);
 
 #endif

-    // __PENH__
+    // _WX_PEN_H_