added wxWeakRef<T> (slightly modified patch 1860953)

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

diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h
index 95c50c06ab00924dfbfc0cf9699d335ebeeffdb1..448c58e69e040d34d0a4fd19123e0946749bd9e1 100644 (file)
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -30,9 +30,6 @@ public:
     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
     bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 

-    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);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);


@@ -61,8 +58,8 @@ public:
     virtual bool IsFree() const;
 
 protected:
     virtual bool IsFree() const;
 
 protected:

-    virtual wxObjectRefData* CreateRefData() const;
-    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;

 
     // same as FreeResource() + RealizeResource()
     bool Recreate();
 
     // same as FreeResource() + RealizeResource()
     bool Recreate();