X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..461fe6e2559a3096d4985a50ba106f26ed890a1d:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index e29f32860c..8f49548b59 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -33,9 +33,6 @@ #endif #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT - // for wxObject::Dump - #include "wx/ioswrap.h" - #if defined(__VISAGECPP__) #define DEBUG_PRINTF(NAME) { static int raz=0; \ printf( #NAME " %i\n",raz); fflush(stdout); raz++; } @@ -68,10 +65,8 @@ const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;} template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;} - template<> const wxTypeInfo* wxGetTypeInfo( wxObject ** ) - { static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::sm_classwxObject) ; return &s_typeInfo ; } - template<> const wxTypeInfo* wxGetTypeInfo( wxObject * ) - { static wxClassTypeInfo s_typeInfo(wxT_OBJECT , &wxObject::sm_classwxObject) ; return &s_typeInfo ; } + 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() ) ; #else wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0, (int) sizeof(wxObject), @@ -101,17 +96,6 @@ bool wxObject::IsKindOf(wxClassInfo *info) const return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ; } -#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT) -void wxObject::Dump(wxSTD ostream& str) -{ - if (GetClassInfo() && GetClassInfo()->GetClassName()) - str << GetClassInfo()->GetClassName(); - else - str << _T("unknown object class"); -} -#endif - - #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new ) #undef new #endif