added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 03a23d01b2a7d8fc3a0eb203269d441f8571239b..69e379684232b87b000d1425aa391f1527305153 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -171,15 +171,13 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
-        ((obj) && ((obj)->IsKindOf(&className::sm_class##className)) \
-        ? (className *)(obj) \
-        : (className *)0)
+    (className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className)
 
 // The 'this' pointer is always true, so use this version to cast the this
 // pointer and avoid compiler warnings.
-#define wxDynamicThisCast(obj, className) \
-        (((obj)->IsKindOf(&className::sm_class##className)) \
-        ? (className *)(obj) \
+#define wxDynamicCastThis(className) \
+        (IsKindOf(&className::sm_class##className) \
+        ? (className *)(this) \
         : (className *)0)
 
 #define wxConstCast(obj, className) ((className *)(obj))
@@ -198,6 +196,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 #endif // Debug/!Debug
 
 // Unfortunately Borland seems to need this include.
+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
 #ifdef __BORLANDC__
     #if wxUSE_IOSTREAMH
         #include <iostream.h>
@@ -205,6 +204,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
         #include <iostream>
     #endif
 #endif
+#endif
 
 class WXDLLEXPORT wxObjectRefData;
 
@@ -219,8 +219,6 @@ class WXDLLEXPORT wxObject
   virtual ~wxObject(void);
 
   virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }
-  wxObject *Clone(void) const;
-  virtual void CopyObject(wxObject& object_dest) const;
 
   bool IsKindOf(wxClassInfo *info) const;
 
@@ -295,6 +293,11 @@ private:
     int m_count;
 };
 
+inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
+{
+    return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : 0;
+}
+
 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW
 #define WXDEBUG_NEW new(__TFILE__,__LINE__)