Use an enum for the colour/string conversion flags

[wxWidgets.git] / include / wx / gdiobj.h

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index fc2e0756d7f2b2b5ba27e7be247e5bc35c3c1570..a7f946d2d67a09f1b0028098f6988dbed6c532d4 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -20,7 +20,7 @@
 // the same native GDI object
 // ----------------------------------------------------------------------------
 
 // the same native GDI object
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_FWD_CORE wxGDIRefData : public wxObjectRefData
+class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData

 {
 public:
     // override this in the derived classes to check if this data object is
 {
 public:
     // override this in the derived classes to check if this data object is


@@ -36,11 +36,11 @@ class WXDLLIMPEXP_CORE wxGDIObject : public wxObject
 {
 public:
     // checks if the object can be used
 {
 public:
     // checks if the object can be used

-    bool IsOk() const
+    virtual bool IsOk() const

     {
         // the cast here is safe because the derived classes always create
         // wxGDIRefData objects
     {
         // the cast here is safe because the derived classes always create
         // wxGDIRefData objects

-        return m_refData && wx_static_cast(wxGDIRefData *, m_refData)->IsOk();
+        return m_refData && static_cast<wxGDIRefData *>(m_refData)->IsOk();

     }
 
     // don't use in the new code, use IsOk() instead
     }
 
     // don't use in the new code, use IsOk() instead


@@ -74,7 +74,7 @@ protected:
 
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const
     {
 
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const
     {

-        return CloneGDIRefData(wx_static_cast(const wxGDIRefData *, data));
+        return CloneGDIRefData(static_cast<const wxGDIRefData *>(data));

     }
 
     virtual wxGDIRefData *CreateGDIRefData() const = 0;
     }
 
     virtual wxGDIRefData *CreateGDIRefData() const = 0;