some const correctness for wxClassInfo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 796231c31a802126e309007dba09f356c737742d..0b479642b6548e4e766bd25760b0164d8573bf17 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -166,7 +166,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
     {
         if (info->m_className)
             classTable.Put(info->m_className, (wxObject *)info);
-        info = info->GetNext();
+        info = (wxClassInfo *)info->GetNext();
     }
 
     // Set base pointers for each wxClassInfo

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 731dd2fdebc3e7b5c054156ac7fd9963ade74492..8f4755be97161f73a5ab8dcbcb88d344bb5a9ca1 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -193,7 +193,11 @@ void wxObject::operator delete[] (void * buf)
  * Class info: provides run-time class type information.
  */
 
-wxClassInfo::wxClassInfo(wxChar *cName, wxChar *baseName1, wxChar *baseName2, int sz, wxObjectConstructorFn constr)
+wxClassInfo::wxClassInfo(const wxChar *cName,
+                         const wxChar *baseName1,
+                         const wxChar *baseName2,
+                         int sz,
+                         wxObjectConstructorFn constr)
 {
     m_className = cName;
     m_baseClassName1 = baseName1;
@@ -217,21 +221,23 @@ wxObject *wxClassInfo::CreateObject()
         return (wxObject *) NULL;
 }
 
-wxClassInfo *wxClassInfo::FindClass(wxChar *c)
+wxClassInfo *wxClassInfo::FindClass(const wxChar *c)
 {
     wxClassInfo *p = sm_first;
     while (p)
     {
-        if (p && p->GetClassName() && wxStrcmp(p->GetClassName(), c) == 0)
-            return p;
+        if ( wxStrcmp(p->GetClassName(), c) == 0 )
+            break;
+
         p = p->m_next;
     }
-    return (wxClassInfo *) NULL;
+
+    return p;
 }
 
 // Climb upwards through inheritance hierarchy.
 // Dual inheritance is catered for.
-bool wxClassInfo::IsKindOf(wxClassInfo *info) const
+bool wxClassInfo::IsKindOf(const wxClassInfo *info) const
 {
     if (info == NULL)
         return FALSE;