Strip menu codes from page label for consistency with other platforms

[wxWidgets.git] / src / dfb / pen.cpp

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index 799f99cf0ca99b0d82b5e83eed0411166c83e4b3..21d36f623ea4f78b155ea7e0cec135aed34a0de3 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -26,7 +26,7 @@
 // wxPen
 //-----------------------------------------------------------------------------
 
-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData
 {
 public:
     wxPenRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
@@ -38,6 +38,8 @@ public:
     wxPenRefData(const wxPenRefData& data)
         : m_style(data.m_style), m_colour(data.m_colour) {}
 
+    virtual bool IsOk() const { return m_colour.IsOk(); }
+
     void SetStyle(int style)
     {
         if ( style != wxSOLID && style != wxTRANSPARENT )
@@ -189,17 +191,12 @@ wxBitmap *wxPen::GetStipple() const
     return NULL;
 }
 
-bool wxPen::IsOk() const
-{
-    return ((m_refData) && M_PENDATA->m_colour.Ok());
-}
-
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const
 {
     return new wxPenRefData;
 }
 
-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }