return radio box own help text when origin is Origin_Unknown to make sure GetHelpText...

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 247c365f661f2009f3fabf33618bac61831c2601..c6e4f241a84a3015975e1e28b8bdc64a04fdb629 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -53,7 +53,7 @@ const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
  wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,
  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) ;}
             0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);
  template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}


@@ -97,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.
 // 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 ;
 }
 
     return (thisInfo) ? thisInfo->IsKindOf(info) : false ;
 }