Changed floats to doubles in wxexpr.h; added a flag in accel.h (wxACCEL_NONE for

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 9604745a00e68eee947b9f8d26541fbe540e0728..7635328dbdbe4b409652a147643b6339d04e4ac4 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -5,12 +5,12 @@
 // 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__
 #pragma interface "pen.h"
 
 #ifdef __GNUG__
 #pragma interface "pen.h"


@@ -27,6 +27,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPen;
 public:
     wxPenRefData(void);
     friend class WXDLLEXPORT wxPen;
 public:
     wxPenRefData(void);

+    wxPenRefData(const wxPenRefData& data);

     ~wxPenRefData(void);
 
 protected:
     ~wxPenRefData(void);
 
 protected:


@@ -49,11 +50,11 @@ class WXDLLEXPORT wxPen: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxPen)
 public:
   wxPen(void);
   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(const wxColour& col, int width, int style);
+  wxPen(const wxString& col, int width, int style);
+  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); }
+  inline wxPen(const wxPen* pen) { if (pen) Ref(*pen); }

   ~wxPen(void);
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
   ~wxPen(void);
 
   inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }


@@ -67,12 +68,12 @@ public:
   void SetColour(const wxString& col)  ;
   void SetColour(const unsigned char r, const unsigned char g, const unsigned char b)  ;
 
   void SetColour(const wxString& col)  ;
   void SetColour(const unsigned char r, const unsigned char g, const 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)  ;
+  void SetDashes(int nb_dashes, const wxDash *dash)  ;
+  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 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); };


@@ -90,9 +91,10 @@ public:
   bool FreeResource(bool force = FALSE);
   WXHANDLE GetResourceHandle(void) ;
   bool IsFree(void);
   bool FreeResource(bool force = FALSE);
   WXHANDLE GetResourceHandle(void) ;
   bool IsFree(void);

+  void Unshare();

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

-    // __PENH__
+    // _WX_PEN_H_