Smooth Aqua buttons in wxTreeCtrl.

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 731dd2fdebc3e7b5c054156ac7fd9963ade74492..20e531a1f26da1639a3700e11acc091feced95b1 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -32,6 +32,11 @@
     #endif // wxUSE_SERIAL
 #endif // WX_PRECOMP
 
     #endif // wxUSE_SERIAL
 #endif // WX_PRECOMP
 

+#ifdef __VISAGECPP__
+        #include "wx/objstrm.h"
+        #include "wx/serbase.h"
+#endif
+

 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>
 


@@ -57,11 +62,6 @@ wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NU
 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 
 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;
 // 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 +77,6 @@ wxObject::wxObject()
 #if wxUSE_SERIAL
     m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 #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()
 }
 
 wxObject::~wxObject()


@@ -92,11 +86,6 @@ wxObject::~wxObject()
     if (m_serialObj)
         delete m_serialObj;
 #endif
     if (m_serialObj)
         delete m_serialObj;
 #endif

-#if defined(__WXDEBUG__) && defined(__VISAGECPP__)
-     N--;
-//  {  printf("~wxObject %i/%i \t",id,N);
-//  }
-#endif  //__WXDEBUG__

 }
 
 /*
 }
 
 /*


@@ -115,24 +104,8 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
         return FALSE;
 }
 
         return FALSE;
 }
 

-wxObject *wxObject::Clone() const
-{
-    wxObject *object = GetClassInfo()->CreateObject();
-    CopyObject(*object);
-    return object;
-}
-
-#ifdef __WXDEBUG__
-void wxObject::CopyObject(wxObject& object_dest) const
-#else // !Debug
-void wxObject::CopyObject(wxObject& WXUNUSED(object_dest)) const
-#endif // Debug/!Debug
-{
-    wxASSERT(object_dest.GetClassInfo()->IsKindOf(GetClassInfo()));
-}
-

 #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();


@@ -193,7 +166,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;


@@ -217,21 +194,23 @@ 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;


@@ -303,7 +282,7 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
  DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
 #endif
 #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);


@@ -341,7 +320,7 @@ void wxObject::StoreObject( wxObjectOutputStream& stream )
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
  DEBUG_PRINTF(wxObject::StoreObject)
 #endif
 #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");
 


@@ -370,7 +349,7 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
  DEBUG_PRINTF(wxObject::LoadObject)
 #endif
 #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");
 


@@ -433,3 +412,26 @@ wxObjectRefData::wxObjectRefData(void) : m_count(1)
 wxObjectRefData::~wxObjectRefData()
 {
 }
 wxObjectRefData::~wxObjectRefData()
 {
 }

+
+#if defined(__DARWIN__) && defined(DYLIB_INIT)
+
+extern "C" {
+    void __initialize_Cplusplus(void);
+    void wxWindowsDylibInit(void);
+};
+
+// Dynamic shared library (dylib) initialization routine
+//   required to initialize static C++ objects bacause of lazy dynamic linking
+//   http://developer.apple.com/techpubs/macosx/Essentials/
+//          SystemOverview/Frameworks/Dynamic_Shared_Libraries.html
+//
+void wxWindowsDylibInit()
+{
+    // The function __initialize_Cplusplus() must be called from the shared
+    // library initialization routine to cause the static C++ objects in
+    // the library to be initialized (reference number 2441683).
+
+    __initialize_Cplusplus();
+}
+
+#endif