Applied patch [ 1586964 ] Getting the PID of the process executed by wxProcess::Open()

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 387a192cfed0e53b8306d7f3071124df6629c879..57d5f1c0d6dff148acc84fb2de0791897d2a91db 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/pen.h
+// Name:        wx/msw/pen.h
 // Purpose:     wxPen class
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PEN_H_
 #define _WX_PEN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "pen.h"
-#endif
-
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 #include "wx/colour.h"
@@ -81,17 +77,8 @@ public:
     wxPen();
     wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
-    wxPen(const wxPen& pen) { Ref(pen); }
     virtual ~wxPen();
 
-    wxPen& operator=(const wxPen& pen)
-    {
-        if ( this != &pen )
-            Ref(pen);
-
-        return *this;
-    }
-
     bool operator==(const wxPen& pen) const
     {
         const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
@@ -102,7 +89,8 @@ public:
 
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
-    virtual bool Ok() const { return (m_refData != NULL); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL); }
 
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);
@@ -132,7 +120,7 @@ public:
 
     // Internal
     bool RealizeResource();
-    bool FreeResource(bool force = FALSE);
+    bool FreeResource(bool force = false);
     WXHANDLE GetResourceHandle() const;
     bool IsFree() const;
     void Unshare();
@@ -142,4 +130,3 @@ private:
 };
 
 #endif // _WX_PEN_H_
-