]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/object.h
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added wxDP_SPIN/DROPDOWN styles (only Win32 native version implements the former)
[wxWidgets.git] / include / wx / object.h
diff --git a/include/wx/object.h b/include/wx/object.h
index e91d7b9fe6e977f05ba40d31a472b996eaaac064..11ffa2b356489989c6ffc7e81016b380543e16dc 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -26,8 +26,6 @@
 
 class WXDLLIMPEXP_BASE wxObject;
 
-#if wxUSE_DYNAMIC_CLASSES
-
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif
@@ -73,7 +71,7 @@ public:
         , m_baseInfo1(baseInfo1)
         , m_baseInfo2(baseInfo2)
         , m_next(sm_first)
-        { 
+        {
             sm_first = this;
             Register();
         }
@@ -107,14 +105,14 @@ public:
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 
-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
     // Initializes parent pointers and hash table for fast searching.
-    wxDEPRECATED( static void     InitializeClasses() );
+    wxDEPRECATED( static void InitializeClasses() );
     // Cleans up hash table used for fast searching.
-    wxDEPRECATED( static void     CleanUpClasses() );
+    wxDEPRECATED( static void CleanUpClasses() );
 #endif
     static void     CleanUp();
-    
+
 public:
     const wxChar            *m_className;
     int                      m_objectSize;
@@ -140,8 +138,8 @@ private:
     static wxClassInfo *GetBaseByName(const wxChar *name);
 
     DECLARE_NO_COPY_CLASS(wxClassInfo)
-   
-protected: 
+
+protected:
     // registers the class
     void Register();
     void Unregister();
@@ -149,7 +147,7 @@ protected:
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
-#ifdef WXWIN_COMPATIBILITY_2_4
+#if WXWIN_COMPATIBILITY_2_4
 inline void wxClassInfo::InitializeClasses() {}
 inline void wxClassInfo::CleanUpClasses() {}
 #endif
@@ -160,9 +158,10 @@ inline void wxClassInfo::CleanUpClasses() {}
 
 #define DECLARE_DYNAMIC_CLASS(name)           \
  public:                                      \
-  static wxClassInfo sm_class##name;          \
+  static wxClassInfo ms_classInfo;            \
+  static wxObject* wxCreateObject();          \
   virtual wxClassInfo *GetClassInfo() const   \
-   { return &name::sm_class##name; }
+   { return &name::ms_classInfo; }
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
     DECLARE_NO_ASSIGN_CLASS(name)               \
@@ -182,23 +181,23 @@ inline void wxClassInfo::CleanUpClasses() {}
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
- wxObject* wxConstructorFor##name()                             \
+ wxObject* name::wxCreateObject()                               \
   { return new name; }                                          \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename::sm_class##basename, NULL,                \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename::ms_classInfo, NULL,                      \
             (int) sizeof(name),                                 \
-            (wxObjectConstructorFn) wxConstructorFor##name);
+            (wxObjectConstructorFn) name::wxCreateObject);
 
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \
- wxObject* wxConstructorFor##name()                             \
+ wxObject* name::wxCreateObject()                               \
   { return new name; }                                          \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename1::sm_class##basename1,                    \
-            &basename2::sm_class##basename2,                    \
-            wxT(#basename2), (int) sizeof(name),                \
-            (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename1::ms_classInfo,                           \
+            &basename2::ms_classInfo,                           \
+            (int) sizeof(name),                                 \
+            (wxObjectConstructorFn) name::wxCreateObject);
 
 // -----------------------------------
 // for abstract classes
@@ -207,16 +206,16 @@ inline void wxClassInfo::CleanUpClasses() {}
     // Single inheritance with one base class
 
 #define IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename::sm_class##basename, NULL,                \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename::ms_classInfo, NULL,                      \
             (int) sizeof(name), (wxObjectConstructorFn) 0);
 
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename1::sm_class##basename1,                    \
-            &basename2::sm_class##basename2,                    \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename1::ms_classInfo,                           \
+            &basename2::ms_classInfo,                           \
             (int) sizeof(name),                                 \
             (wxObjectConstructorFn) 0);
 
@@ -293,66 +292,33 @@ name##PluginSentinel  m_pluginsentinel;
 #define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
  IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
 
-#define CLASSINFO(name) (&name::sm_class##name)
-
-#else // !wxUSE_DYNAMIC_CLASSES
-
-    // No dynamic class system: so stub out the macros
-
-#define DECLARE_DYNAMIC_CLASS(name)
-#define DECLARE_ABSTRACT_CLASS(name)
-#define DECLARE_CLASS(name)
-#define IMPLEMENT_DYNAMIC_CLASS(name, basename)
-#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
-#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
-
-#define DECLARE_PLUGGABLE_CLASS(name)
-#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name)
-#define IMPLEMENT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
-
-#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo)
-#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
+#define CLASSINFO(name) (&name::ms_classInfo)
 
-#endif // wxUSE_DYNAMIC_CLASSES
-
-#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)
 
 // Just seems a bit nicer-looking (pretend it's not a macro)
-#define wxIsKindOf(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIsKindOf(obj, className) obj->IsKindOf(&className::ms_classInfo)
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
- ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className))
+    ((className *) wxCheckDynamicCast( \
+        wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
+          wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
+        &className::ms_classInfo))
 
 // The 'this' pointer is always true, so use this version
 // to cast the this pointer and avoid compiler warnings.
 #define wxDynamicCastThis(className) \
- (IsKindOf(&className::sm_class##className) ? (className *)(this) : (className *)0)
-
-#ifdef HAVE_CONST_CAST
-#define wxConstCast(obj, className) const_cast<className *>(obj)
-#else
-#define wxConstCast(obj, className) ((className *)(obj))
-#endif
-
+ (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
 
 #ifdef __WXDEBUG__
-inline void wxCheckCast(void *ptr)
+inline void* wxCheckCast(void *ptr)
 {
     wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
+    return ptr;
 }
 #define wxStaticCast(obj, className) \
- (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+ ((className *)wxCheckCast(wxDynamicCast(obj, className)))
 
 #else  // !__WXDEBUG__
 #define wxStaticCast(obj, className) ((className *)(obj))
@@ -418,7 +384,7 @@ inline void wxCheckCast(void *ptr)
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 // ----------------------------------------------------------------------------
-// wxObject: the root class of wxWindows object hierarchy
+// wxObject: the root class of wxWidgets object hierarchy
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxObject
@@ -549,7 +515,11 @@ public:
     // get the runtime identity of this object
     wxClassInfo *GetClassInfo() const
     {
-               return const_cast<wxClassInfo*>((const wxClassInfo*)m_classInfo);
+#ifdef _MSC_VER
+        return (wxClassInfo*) m_classInfo;
+#else
+        return wx_const_cast(wxClassInfo *, m_classInfo);
+#endif
     }
 
     wxObject* GetSuperClassInstance() const
@@ -588,6 +558,9 @@ private :
 
 #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
     #define new new(__TFILE__,__LINE__)
+#elif (defined(__WXDEBUG__) && defined(__VISUALC__) && !wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS)
+    // Including this file redefines new and allows leak reports to contain line numbers
+    #include "wx/msw/msvcrt.h"
 #endif
 
 #endif  // _WX_OBJECTH__
wxWidgets (Impactor)