reverted the change of r56246 and keep the old behaviour of MB2WC/WC2MB; document...

[wxWidgets.git] / interface / wx / object.h

diff --git a/interface/wx/object.h b/interface/wx/object.h
index c33355f97f9d16db2016491f9fd8542c6548256c..e3f7e93a0df712d05fce2bcaf5d861d6e84ef2d6 100644 (file)
--- a/interface/wx/object.h
+++ b/interface/wx/object.h
@@ -125,7 +125,7 @@ protected:
         It's declared @c protected so that wxObjectRefData instances
         will never be destroyed directly but only as result of a DecRef() call.
     */
-    ~wxObjectRefData();
+    virtual ~wxObjectRefData();
 
 public:
     /**
@@ -200,7 +200,7 @@ public:
 
         Performs dereferencing, for those objects that use reference counting.
     */
-    ~wxObject();
+    virtual ~wxObject();
 
     /**
         A virtual function that may be redefined by derived classes to allow dumping of
@@ -225,7 +225,7 @@ public:
         This virtual function is redefined for every class that requires run-time
         type information, when using the ::DECLARE_CLASS macro (or similar).
     */
-    wxClassInfo* GetClassInfo();
+    virtual wxClassInfo* GetClassInfo() const;
 
     /**
         Returns the wxObject::m_refData pointer, i.e. the data referenced by this object.
@@ -251,7 +251,7 @@ public:
         @return @true if the class represented by info is the same class as this
                  one or is derived from it.
     */
-    bool IsKindOf(wxClassInfo* info);
+    bool IsKindOf(const wxClassInfo* info) const;
 
     /**
         Returns @true if this object has the same data pointer as @a obj.
@@ -263,7 +263,7 @@ public:
 
         @see @ref overview_refcount
     */
-    bool IsSameAs(const wxObject& obj);
+    bool IsSameAs(const wxObject& obj) const;
 
     /**
         Makes this object refer to the data in @a clone.