X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0db962623bc3a6b7301bfd8b0894758835d14bc..40e32bca6c12a7068cded7cf5a39381e78b1b6b1:/src/common/object.cpp?ds=sidebyside

diff --git a/src/common/object.cpp b/src/common/object.cpp
index acf2b96975..e7692e7384 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -49,24 +49,24 @@
 #endif
 
 #if wxUSE_EXTENDED_RTTI
-const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ;
+const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
  wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data )
-{ return data.Get<wxObject*>() ; }
+{ return data.wxTEMPLATED_MEMBER_CALL(Get , wxObject*) ; }
  wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data )
-{ return &data.Get<wxObject>() ; }
+{ return &data.wxTEMPLATED_MEMBER_CALL(Get , wxObject) ; }
  wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
  { return wxxVariant( dynamic_cast<wxObject*> (data)  ) ; }
- wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"),
+ wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
-			(wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
-			0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);
+            (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
+            0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);
  template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
  template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;}
- wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::sm_classwxObject , NULL , NULL , typeid(wxObject*).name() ) ; 
- wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::sm_classwxObject , NULL , NULL , typeid(wxObject).name() ) ; 
+ wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ;
+ wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ;
 #else
 wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),
@@ -81,10 +81,25 @@ wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
 wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;
 
+// when using XTI, this method is already implemented inline inside
+// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function
+// non-inline because this allows us to have a non-inline virtual function in
+// all wx classes and this solves linking problems for HP-UX native toolchain
+// and possibly others (we could make dtor non-inline as well but it's more
+// useful to keep it inline than this function)
+#if !wxUSE_EXTENDED_RTTI
+
+wxClassInfo *wxObject::GetClassInfo() const
+{
+    return &wxObject::ms_classInfo;
+}
+
+#endif // wxUSE_EXTENDED_RTTI
+
 // These are here so we can avoid 'always true/false' warnings
-// by referring to these instead of TRUE/FALSE
-const bool wxTrue = TRUE;
-const bool wxFalse = FALSE;
+// by referring to these instead of true/false
+const bool wxTrue = true;
+const bool wxFalse = false;
 
 // Is this object a kind of (a subclass of) 'info'?
 // E.g. is wxWindow a kind of wxObject?
@@ -93,18 +108,18 @@ const bool wxFalse = FALSE;
 bool wxObject::IsKindOf(wxClassInfo *info) const
 {
     wxClassInfo *thisInfo = GetClassInfo();
-    return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ;
+    return (thisInfo) ? thisInfo->IsKindOf(info) : false ;
 }
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
-	#undef new
+    #undef new
 #endif
 
 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
 void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum )
 {
-    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE);
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true);
 }
 #endif
 
@@ -132,21 +147,21 @@ void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), in
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
 void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum )
 {
-    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE, TRUE);
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true, true);
 }
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID
 void wxObject::operator delete[] ( void *buf )
 {
-    wxDebugFree(buf, TRUE);
+    wxDebugFree(buf, true);
 }
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
 void wxObject::operator delete[] (void * buf, const wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )
 {
-    wxDebugFree(buf, TRUE);
+    wxDebugFree(buf, true);
 }
 #endif
 
@@ -178,7 +193,7 @@ wxClassInfo::~wxClassInfo()
             info = info->m_next;
         }
     }
-	Unregister();
+    Unregister();
 }
 
 wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
@@ -222,7 +237,7 @@ void wxClassInfo::Register()
     // try to do some checks here
     wxASSERT_MSG( sm_classTable->Get(m_className) == NULL,
                   _T("class already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") );
-    
+
     sm_classTable->Put(m_className, (wxObject *)this);
 }