fixed serious bug in wxFont::operator== (ignored weight)

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 731dd2fdebc3e7b5c054156ac7fd9963ade74492..83a8fec5ad349385e424ae3bd75aee4b918ed95e 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -57,11 +57,6 @@ wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NU
 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 
-#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
-  int wxObject::N = 0;  // total number of objects
-  int wxObject::Nid = 0;// object serial counter
-#endif // __WXDEBUG__
-
 // These are here so we can avoid 'always true/false' warnings
 // by referring to these instead of TRUE/FALSE
 const bool wxTrue = TRUE;
@@ -77,12 +72,6 @@ wxObject::wxObject()
 #if wxUSE_SERIAL
     m_serialObj = (wxObject_Serialize *)NULL;
 #endif
-#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
-    id = Nid++;
-    N++;
-//  {  printf("wxObject %i/%i \t",id,N);
-//  }
-#endif
 }
 
 wxObject::~wxObject()
@@ -92,11 +81,6 @@ wxObject::~wxObject()
     if (m_serialObj)
         delete m_serialObj;
 #endif
-#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
-     N--;
-//  {  printf("~wxObject %i/%i \t",id,N);
-//  }
-#endif  //__WXDEBUG__
 }
 
 /*
@@ -132,7 +116,7 @@ void wxObject::CopyObject(wxObject& WXUNUSED(object_dest)) const
 }
 
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-void wxObject::Dump(ostream& str)
+void wxObject::Dump(wxSTD ostream& str)
 {
     if (GetClassInfo() && GetClassInfo()->GetClassName())
         str << GetClassInfo()->GetClassName();
@@ -193,7 +177,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 +205,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;
@@ -303,7 +293,7 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
  DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
 #endif
-     
+
     if (wxClassInfo::sm_classTable)
     {
         wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
@@ -341,7 +331,7 @@ void wxObject::StoreObject( wxObjectOutputStream& stream )
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
  DEBUG_PRINTF(wxObject::StoreObject)
 #endif
-     
+
     wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
     wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 
@@ -370,7 +360,7 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
  DEBUG_PRINTF(wxObject::LoadObject)
 #endif
-     
+
     wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
     wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");