X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1e10a22b6a2f859d23024bdb57f84665f66f89e..48fd6e9dd7ee68b727a8053ecb4c2956aa862312:/src/common/object.cpp diff --git a/src/common/object.cpp b/src/common/object.cpp index 301b632556..c6e4f241a8 100644 --- a/src/common/object.cpp +++ b/src/common/object.cpp @@ -21,6 +21,7 @@ #include "wx/object.h" #include "wx/hash.h" #include "wx/memory.h" + #include "wx/crt.h" #endif #include @@ -52,7 +53,7 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ; wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"), (int) sizeof(wxObject), \ (wxObjectConstructorFn) 0 , - (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 , + NULL,NULL,0 , 0 , 0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject); template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;} template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;} @@ -96,9 +97,9 @@ const bool wxFalse = false; // E.g. is wxWindow a kind of wxObject? // Go from this class to superclass, taking into account // two possible base classes. -bool wxObject::IsKindOf(wxClassInfo *info) const +bool wxObject::IsKindOf(const wxClassInfo *info) const { - wxClassInfo *thisInfo = GetClassInfo(); + const wxClassInfo *thisInfo = GetClassInfo(); return (thisInfo) ? thisInfo->IsKindOf(info) : false ; }