Updated font dialog constructors to use a reference to the font data

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index a9b7d22d613a00b11491d4267646166e7a7c1d09..7148e579b3d60835cdd18d08bec5ce46e2c89ca0 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -77,11 +77,15 @@ void wxObject::Dump(wxSTD ostream& str)
 #endif
 
 
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
+       #undef new
+#endif
+
 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
-void *wxObject::operator new ( size_t size, wxChar *fileName, int lineNum )
+void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum )
 {
-    return wxDebugAlloc(size, fileName, lineNum, TRUE);
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE);
 }
 #endif
 
@@ -100,16 +104,16 @@ void wxObject::operator delete ( void *buf, const char *_fname, size_t _line )
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
-void wxObject::operator delete ( void *buf, wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) )
+void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) )
 {
      wxDebugFree(buf);
 }
 #endif
 
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
-void *wxObject::operator new[] ( size_t size, wxChar* WXUNUSED(fileName), int WXUNUSED(lineNum) )
+void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum )
 {
-    return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE, TRUE);
 }
 #endif
 
@@ -121,7 +125,7 @@ void wxObject::operator delete[] ( void *buf )
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
-void wxObject::operator delete[] (void * buf, wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )
+void wxObject::operator delete[] (void * buf, const wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )
 {
     wxDebugFree(buf, TRUE);
 }
@@ -184,7 +188,7 @@ void wxClassInfo::InitializeClasses()
     size_t nClass = 0;
 #endif
 
-    wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
+    sm_classTable = new wxHashTable(wxKEY_STRING);
 
         // Index all class infos by their class name
 
@@ -242,9 +246,18 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
 
 
 // ----------------------------------------------------------------------------
-// wxClassInfo
+// wxObject
 // ----------------------------------------------------------------------------
 
+// Initialize ref data from another object (needed for copy constructor and
+// assignment operator)
+void wxObject::InitFrom(const wxObject& other)
+{
+    m_refData = other.m_refData;
+    if ( m_refData )
+        m_refData->m_count++;
+}
+
 void wxObject::Ref(const wxObject& clone)
 {
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
@@ -320,17 +333,17 @@ wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const
 // misc
 // ----------------------------------------------------------------------------
 
-#if defined(__DARWIN__) && defined(DYLIB_INIT)
+#if defined(__DARWIN__) && defined(WXMAKINGDLL)
 
 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
+// 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()
 {
@@ -338,6 +351,8 @@ void wxWindowsDylibInit()
     // library initialization routine to cause the static C++ objects in
     // the library to be initialized (reference number 2441683).
 
+    // This only seems to be necessary if the library initialization routine
+    // needs to use the static C++ objects
     __initialize_Cplusplus();
 }