1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index c980106cbbaf6bfd47a129ea26b1808fcc7af6cf..1a6fae329d6a5d0bf93258139d55457b2f399944 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "memory.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -26,10 +22,6 @@
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-// #pragma implementation
-#endif
-

 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/app.h"
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
 #include "wx/app.h"


@@ -68,7 +60,7 @@
 
 #include "wx/memory.h"
 
 
 #include "wx/memory.h"
 

-#if wxUSE_THREADS && defined(__WXDEBUG__) && !defined(__WXMAC__)
+#if wxUSE_THREADS && defined(__WXDEBUG__)

 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #define USE_THREADSAFE_MEMORY_ALLOCATION 0
 #define USE_THREADSAFE_MEMORY_ALLOCATION 1
 #else
 #define USE_THREADSAFE_MEMORY_ALLOCATION 0


@@ -117,7 +109,7 @@
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {
 */
 void wxMemStruct::ErrorMsg (const char * mesg)
 {

-  wxLogMessage(wxT("wxWindows memory checking error: %s"), mesg);
+  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);

   PrintNode ();
 }
 
   PrintNode ();
 }
 


@@ -126,7 +118,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
 */
 void wxMemStruct::ErrorMsg ()
 {
 */
 void wxMemStruct::ErrorMsg ()
 {

-  wxLogMessage(wxT("wxWindows over/underwrite memory error:"));
+  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));

   PrintNode ();
 }
 
   PrintNode ();
 }
 


@@ -332,7 +324,7 @@ void wxMemStruct::PrintNode ()
 
     // Let's put this in standard form so IDEs can load the file at the appropriate
     // line
 
     // Let's put this in standard form so IDEs can load the file at the appropriate
     // line

-    wxString msg(wxT(""));
+    wxString msg;

 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);


@@ -350,7 +342,7 @@ void wxMemStruct::PrintNode ()
   }
   else
   {
   }
   else
   {

-    wxString msg(wxT(""));
+    wxString msg;

 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);


@@ -371,7 +363,7 @@ void wxMemStruct::Dump ()
   {
     wxObject *obj = (wxObject *)m_actualData;
 
   {
     wxObject *obj = (wxObject *)m_actualData;
 

-    wxString msg(wxT(""));
+    wxString msg;

     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 


@@ -388,7 +380,7 @@ void wxMemStruct::Dump ()
     else
       msg += wxT("unknown object class");
 
     else
       msg += wxT("unknown object class");
 

-    wxString msg2(wxT(""));
+    wxString msg2;

     msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 
     msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
     msg += msg2;
 


@@ -396,11 +388,11 @@ void wxMemStruct::Dump ()
   }
   else
   {
   }
   else
   {

-    wxString msg(wxT(""));
+    wxString msg;

     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 
     if (m_fileName)
       msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
 

-    wxString msg2(wxT(""));
+    wxString msg2;

     msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
     wxDebugContext::OutputDumpLine(msg);
     msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
     msg += msg2;
     wxDebugContext::OutputDumpLine(msg);


@@ -464,9 +456,9 @@ int wxMemStruct::ValidateNode ()
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
 
 wxMemStruct *wxDebugContext::m_head = NULL;
 wxMemStruct *wxDebugContext::m_tail = NULL;
 

-bool wxDebugContext::m_checkPrevious = FALSE;
+bool wxDebugContext::m_checkPrevious = false;

 int wxDebugContext::debugLevel = 1;
 int wxDebugContext::debugLevel = 1;

-bool wxDebugContext::debugOn = TRUE;
+bool wxDebugContext::debugOn = true;

 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
 // For faster alignment calculation
 wxMemStruct *wxDebugContext::checkPoint = NULL;
 
 // For faster alignment calculation


@@ -597,9 +589,9 @@ bool wxDebugContext::PrintList (void)
 #ifdef __WXDEBUG__
   TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
 #ifdef __WXDEBUG__
   TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 

-  return TRUE;
+  return true;

 #else
 #else

-  return FALSE;
+  return false;

 #endif
 }
 
 #endif
 }
 


@@ -608,7 +600,7 @@ bool wxDebugContext::Dump(void)
 #ifdef __WXDEBUG__
   {
     wxChar* appName = (wxChar*) wxT("application");
 #ifdef __WXDEBUG__
   {
     wxChar* appName = (wxChar*) wxT("application");

-    wxString appNameStr(wxT(""));
+    wxString appNameStr;

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();


@@ -623,12 +615,12 @@ bool wxDebugContext::Dump(void)
 
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 
 
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
 

-  OutputDumpLine( wxT("") );
-  OutputDumpLine( wxT("") );
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);

 
 

-  return TRUE;
+  return true;

 #else
 #else

-  return FALSE;
+  return false;

 #endif
 }
 
 #endif
 }
 


@@ -664,7 +656,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 #ifdef __WXDEBUG__
   {
     wxChar* appName = (wxChar*) wxT("application");
 #ifdef __WXDEBUG__
   {
     wxChar* appName = (wxChar*) wxT("application");

-    wxString appNameStr(wxT(""));
+    wxString appNameStr;

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();


@@ -678,7 +670,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   }
 
   bool currentMode = GetDebugMode();
   }
 
   bool currentMode = GetDebugMode();

-  SetDebugMode(FALSE);
+  SetDebugMode(false);

 
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
 
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;


@@ -736,7 +728,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       list = old->next;
       free((char *)old);
     }
       list = old->next;
       free((char *)old);
     }

-    OutputDumpLine(wxT(""));
+    OutputDumpLine(wxEmptyString);

   }
 
   SetDebugMode(currentMode);
   }
 
   SetDebugMode(currentMode);


@@ -744,13 +736,13 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes);
   OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes);
   OutputDumpLine(wxT("Total allocated size: %ld"), totalSize);
   OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes);
   OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes);
   OutputDumpLine(wxT("Total allocated size: %ld"), totalSize);

-  OutputDumpLine(wxT(""));
-  OutputDumpLine(wxT(""));
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);

 
 

-  return TRUE;
+  return true;

 #else
   (void)detailed;
 #else
   (void)detailed;

-  return FALSE;
+  return false;

 #endif
 }
 
 #endif
 }
 


@@ -758,7 +750,7 @@ bool wxDebugContext::PrintClasses(void)
 {
   {
     wxChar* appName = (wxChar*) wxT("application");
 {
   {
     wxChar* appName = (wxChar*) wxT("application");

-    wxString appNameStr(wxT(""));
+    wxString appNameStr;

     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();
     if (wxTheApp)
     {
         appNameStr = wxTheApp->GetAppName();


@@ -801,11 +793,11 @@ bool wxDebugContext::PrintClasses(void)
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }
     node = wxClassInfo::sm_classTable->Next();
     n ++;
   }

-  wxLogMessage(wxT(""));
+  wxLogMessage(wxEmptyString);

   wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
   wxLogMessage(wxT("There are %d classes derived from wxObject."), n);

-  wxLogMessage(wxT(""));
-  wxLogMessage(wxT(""));
-  return TRUE;
+  wxLogMessage(wxEmptyString);
+  wxLogMessage(wxEmptyString);
+  return true;

 }
 
 void wxDebugContext::SetCheckpoint(bool all)
 }
 
 void wxDebugContext::SetCheckpoint(bool all)


@@ -867,13 +859,13 @@ void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
     int count;
     va_list argptr;
     va_start(argptr, szFormat);
     int count;
     va_list argptr;
     va_start(argptr, szFormat);

-    buf[sizeof(buf)-1] = _T('\0');
+    buf[sizeof(buf)/sizeof(wxChar)-1] = _T('\0');

 
     // keep 3 bytes for a \r\n\0
 
     // keep 3 bytes for a \r\n\0

-    count = wxVsnprintf(buf, sizeof(buf)-3, szFormat, argptr);
+    count = wxVsnprintf(buf, sizeof(buf)/sizeof(wxChar)-3, szFormat, argptr);

 
     if ( count < 0 )
 
     if ( count < 0 )

-        count = sizeof(buf)-3;
+        count = sizeof(buf)/sizeof(wxChar)-3;

     buf[count]=_T('\r');
     buf[count+1]=_T('\n');
     buf[count+2]=_T('\0');
     buf[count]=_T('\r');
     buf[count+1]=_T('\n');
     buf[count+2]=_T('\0');


@@ -884,21 +876,24 @@ void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
 
 
 #if USE_THREADSAFE_MEMORY_ALLOCATION
 
 
 #if USE_THREADSAFE_MEMORY_ALLOCATION

-static bool memSectionOk = FALSE;
+static bool memSectionOk = false;

 
 class MemoryCriticalSection : public wxCriticalSection
 {
 public:
 
 class MemoryCriticalSection : public wxCriticalSection
 {
 public:

-       MemoryCriticalSection() {
-               memSectionOk = TRUE;
-       }
+    MemoryCriticalSection() {
+        memSectionOk = true;
+    }
+    ~MemoryCriticalSection() {
+        memSectionOk = false;
+    }

 };
 
 class MemoryCriticalSectionLocker
 {
 public:
     inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)
 };
 
 class MemoryCriticalSectionLocker
 {
 public:
     inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)

-       : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
+    : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }

     inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
 
 private:
     inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
 
 private:


@@ -907,11 +902,50 @@ private:
     MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
 
     wxCriticalSection& m_critsect;
     MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
 
     wxCriticalSection& m_critsect;

-       bool    m_locked;
+    bool m_locked;

 };
 
 static MemoryCriticalSection memLocker;
 };
 
 static MemoryCriticalSection memLocker;

-#endif
+
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+
+
+#ifdef __WXDEBUG__
+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
+void * operator new (size_t size, wxChar * fileName, int lineNum)
+{
+    return wxDebugAlloc(size, fileName, lineNum, false, false);
+}
+
+void * operator new (size_t size)
+{
+    return wxDebugAlloc(size, NULL, 0, false);
+}
+
+void operator delete (void * buf)
+{
+    wxDebugFree(buf, false);
+}
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size)
+{
+    return wxDebugAlloc(size, NULL, 0, false, true);
+}
+
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)
+{
+    return wxDebugAlloc(size, fileName, lineNum, false, true);
+}
+
+void operator delete[] (void * buf)
+{
+  wxDebugFree(buf, true);
+}
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )


@@ -1023,6 +1057,8 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     free((char *)st);
 }
 
     free((char *)st);
 }
 

+#endif // __WXDEBUG__
+

 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {


@@ -1101,17 +1137,17 @@ void wxTraceLevel(int, const wxChar * ...)
 }
 
 //----------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------

-// Final cleanup after all global objects in all files have been destructed
+// Final cleanup after all global objects in all files have been destroyed

 //----------------------------------------------------------------------------
 
 // Don't set it to 0 by dynamic initialization
 //----------------------------------------------------------------------------
 
 // Don't set it to 0 by dynamic initialization

-// Some compilers will realy do the asignment later
+// Some compilers will really do the assignment later

 // All global variables are initialized to 0 at the very beginning, and this is just fine.
 int wxDebugContextDumpDelayCounter::sm_count;
 
 void wxDebugContextDumpDelayCounter::DoDump()
 {
 // All global variables are initialized to 0 at the very beginning, and this is just fine.
 int wxDebugContextDumpDelayCounter::sm_count;
 
 void wxDebugContextDumpDelayCounter::DoDump()
 {

-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
+    if (wxDebugContext::CountObjectsLeft(true) > 0)

     {
         wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
         wxDebugContext::Dump();
     {
         wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
         wxDebugContext::Dump();


@@ -1120,7 +1156,7 @@ void wxDebugContextDumpDelayCounter::DoDump()
 }
 
 // Even if there is nothing else, make sure that there is at
 }
 
 // Even if there is nothing else, make sure that there is at

-// least one clenup counter object
+// least one cleanup counter object

 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 
 #endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
 
 #endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT