use wxWindows zlib.h instead of Mac OS X system zlib.h directly

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 41fce11f1682a4b1023a3a8e3986f95468a6085e..83a8fec5ad349385e424ae3bd75aee4b918ed95e 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -42,13 +42,25 @@
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     // for wxObject::Dump
     #include "wx/ioswrap.h"
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     // for wxObject::Dump
     #include "wx/ioswrap.h"

+    #if defined(__VISAGECPP__)
+    // help with VA debugging
+        #define DEBUG_PRINTF(NAME)   { static int raz=0; \
+          printf( #NAME " %i\n",raz); fflush(stdout);       \
+           raz++;                                        \
+         }
+    #else
+        #define DEBUG_PRINTF(NAME)
+    #endif

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY

 wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;

-#endif
+
+// These are here so we can avoid 'always true/false' warnings
+// by referring to these instead of TRUE/FALSE
+const bool wxTrue = TRUE;
+const bool wxFalse = FALSE;

 
 /*
  * wxWindows root object.
 
 /*
  * wxWindows root object.


@@ -104,7 +116,7 @@ void wxObject::CopyObject(wxObject& WXUNUSED(object_dest)) const
 }
 
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
 }
 
 #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();
 {
     if (GetClassInfo() && GetClassInfo()->GetClassName())
         str << GetClassInfo()->GetClassName();


@@ -124,14 +136,23 @@ void *wxObject::operator new (size_t size, wxChar * fileName, int lineNum)
     return wxDebugAlloc(size, fileName, lineNum, TRUE);
 }
 
     return wxDebugAlloc(size, fileName, lineNum, TRUE);
 }
 

+#if defined(__VISAGECPP__)
+#  if __DEBUG_ALLOC__
+void wxObject::operator delete (void * buf,const char * _fname, size_t _line)
+{
+    wxDebugFree(buf);
+}
+#  endif  //__DEBUG_ALLOC__
+#else

 void wxObject::operator delete (void * buf)
 {
     wxDebugFree(buf);
 }
 void wxObject::operator delete (void * buf)
 {
     wxDebugFree(buf);
 }

+#endif // __VISAGECPP__

 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void wxObject::operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)

 {
     ::operator delete(pData);
 }
 {
     ::operator delete(pData);
 }


@@ -156,7 +177,11 @@ void wxObject::operator delete[] (void * buf)
  * Class info: provides run-time class type information.
  */
 
  * 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;
 {
     m_className = cName;
     m_baseClassName1 = baseName1;


@@ -180,35 +205,27 @@ wxObject *wxClassInfo::CreateObject()
         return (wxObject *) NULL;
 }
 
         return (wxObject *) NULL;
 }
 

-wxClassInfo *wxClassInfo::FindClass(wxChar *c)
+wxClassInfo *wxClassInfo::FindClass(const wxChar *c)

 {
     wxClassInfo *p = sm_first;
     while (p)
     {
 {
     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;
     }
         p = p->m_next;
     }

-    return (wxClassInfo *) NULL;
+
+    return p;

 }
 
 // Climb upwards through inheritance hierarchy.
 // Dual inheritance is catered for.
 }
 
 // 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;
 
 {
     if (info == NULL)
         return FALSE;
 

-    // For some reason, when making/using a DLL, static data has to be included
-    // in both the DLL and the application. This can lead to duplicate
-    // wxClassInfo objects, so we have to test the name instead of the pointers.
-    // PROBABLY NO LONGER TRUE now I've done DLL creation right.
-    /*
-#if WXMAKINGDLL
-if (GetClassName() && info->GetClassName() && (wxStrcmp(GetClassName(), info->GetClassName()) == 0))
-return TRUE;
-#else
-     */

     if (this == info)
         return TRUE;
 
     if (this == info)
         return TRUE;
 


@@ -245,9 +262,7 @@ void wxClassInfo::InitializeClasses()
         if (info->m_className)
         {
             wxASSERT_MSG( ++nClass < nMaxClasses,
         if (info->m_className)
         {
             wxASSERT_MSG( ++nClass < nMaxClasses,

-                          _T("an infinite loop detected - have you used "
-                            "IMPLEMENT_DYNAMIC_CLASS() twice (may be by "
-                            "linking some object module(s) twice)?") );
+                          _T("an infinite loop detected - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") );

 
             sm_classTable->Put(info->m_className, (wxObject *)info);
         }
 
             sm_classTable->Put(info->m_className, (wxObject *)info);
         }


@@ -275,6 +290,10 @@ void wxClassInfo::CleanUpClasses()
 
 wxObject *wxCreateDynamicObject(const wxChar *name)
 {
 
 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);
     if (wxClassInfo::sm_classTable)
     {
         wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);


@@ -300,7 +319,6 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"

-#include "wx/msgdlg.h"

 
 wxObject* wxCreateStoredObject( wxInputStream &stream )
 {
 
 wxObject* wxCreateStoredObject( wxInputStream &stream )
 {


@@ -310,6 +328,10 @@ wxObject* wxCreateStoredObject( wxInputStream &stream )
 
 void wxObject::StoreObject( wxObjectOutputStream& stream )
 {
 
 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");
 
     wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
     wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 


@@ -335,6 +357,10 @@ void wxObject::StoreObject( wxObjectOutputStream& stream )
 
 void wxObject::LoadObject( wxObjectInputStream& stream )
 {
 
 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");
 
     wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
     wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
 


@@ -362,7 +388,10 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
 
 void wxObject::Ref(const wxObject& clone)
 {
 
 void wxObject::Ref(const wxObject& clone)
 {

-    // delete reference to old data
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject::Ref)
+#endif
+     // delete reference to old data

     UnRef();
     // reference new data
     if (clone.m_refData) {
     UnRef();
     // reference new data
     if (clone.m_refData) {


@@ -379,7 +408,6 @@ void wxObject::UnRef()
 
         if ( !--m_refData->m_count )
             delete m_refData;
 
         if ( !--m_refData->m_count )
             delete m_refData;

-

         m_refData = (wxObjectRefData *) NULL;
     }
 }
         m_refData = (wxObjectRefData *) NULL;
     }
 }


@@ -395,8 +423,3 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1)
 wxObjectRefData::~wxObjectRefData()
 {
 }
 wxObjectRefData::~wxObjectRefData()
 {
 }

-
-// These are here so we can avoid 'always true/false' warnings
-// by referring to these instead of TRUE/FALSE
-const bool wxTrue = TRUE;
-const bool wxFalse = FALSE;