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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 7f03d2ae38..e7692e7384 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -56,7 +56,7 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
 { return &data.wxTEMPLATED_MEMBER_CALL(Get , wxObject) ; }
  wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
  { return wxxVariant( dynamic_cast<wxObject*> (data)  ) ; }
- wxClassInfo wxObject::ms_classInfo(ms_classParents , wxT("") , wxT("wxObject"),
+ wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
             (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
@@ -81,6 +81,21 @@ 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;