Fixed wxSplitterEvent to set it's id to be the splitter window's id so

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index b12620c655553f1f9c5ba55394127409f5948a5e..94356b2dd85b318fc961774f57a52df843278fc6 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__


@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/string.h"

 
 /*
   The macro which will be expanded to include the file and line number
 
 /*
   The macro which will be expanded to include the file and line number


@@ -28,20 +29,18 @@
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH

-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <iostream.h>
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>

 #else
 #else

-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <ostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif

 #endif
 
 #endif
 

-#include "wx/string.h"
-

 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__
 

-void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
+void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = FALSE);

 void wxDebugFree(void * buf, bool isVect = FALSE);
 
 // Global versions of the new and delete operators.
 void wxDebugFree(void * buf, bool isVect = FALSE);
 
 // Global versions of the new and delete operators.


@@ -50,32 +49,46 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 // Undefine temporarily (new is #defined in object.h) because we want to
 // declare some new operators.
 #ifdef new
 // Undefine temporarily (new is #defined in object.h) because we want to
 // declare some new operators.
 #ifdef new

-#undef new
+    #undef new

 #endif
 
 #endif
 

-// Added JACS 25/11/98: needed for some compilers
-void * operator new (size_t size);
-
-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-void * operator new[] (size_t size);
+#if defined(__SUNCC__)
+    #define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
+    #define wxUSE_ARRAY_MEMORY_OPERATORS 1
+#elif defined (__SGI_CC_)
+    // only supported by -n32 compilers
+    #ifndef __EDG_ABI_COMPATIBILITY_VERSION
+        #define wxUSE_ARRAY_MEMORY_OPERATORS 0
+    #endif
+#else
+    // ::operator new[] is a recent C++ feature, so assume it's not supported
+    #define wxUSE_ARRAY_MEMORY_OPERATORS 0

 #endif
 
 #endif
 

-void * operator new (size_t size, char * fileName, int lineNum);
+// Added JACS 25/11/98: needed for some compilers
+void * operator new (size_t size);
+void * operator new (size_t size, wxChar * fileName, int lineNum);
+#if !defined(__VISAGECPP__)

 void operator delete (void * buf);
 void operator delete (void * buf);

+#endif

 
 

-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
-void * operator new[] (size_t size, char * fileName, int lineNum);
-void operator delete[] (void * buf);
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+    void * operator new[] (size_t size);
+    void * operator new[] (size_t size, wxChar * fileName, int lineNum);
+    void operator delete[] (void * buf);

 #endif
 
 // VC++ 6.0
 #endif
 
 // VC++ 6.0

-#if _MSC_VER >= 1200
-void operator delete(void *buf, char*, int);
-void operator delete[](void *buf, char*, int);
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+    void operator delete(void *buf, wxChar*, int);
+    void operator delete[](void *buf, wxChar*, int);

 #endif
 
 #endif
 #endif
 
 #endif

+  // wxUSE_GLOBAL_MEMORY_OPERATORS

 #endif
 #endif

+  // __WXDEBUG__

 
 typedef unsigned int wxMarkerType;
 
 
 typedef unsigned int wxMarkerType;
 


@@ -130,7 +143,7 @@ public:
     wxMarkerType        m_firstMarker;
 
     // File name and line number are from cpp.
     wxMarkerType        m_firstMarker;
 
     // File name and line number are from cpp.

-    char*               m_fileName;
+    wxChar*             m_fileName;

     int                 m_lineNum;
 
     // The amount of memory requested by the caller.
     int                 m_lineNum;
 
     // The amount of memory requested by the caller.


@@ -205,7 +218,7 @@ public:
 
     static void SetCheckpoint(bool all = FALSE);
     static wxMemStruct *GetCheckpoint(void) { return checkPoint; }
 
     static void SetCheckpoint(bool all = FALSE);
     static wxMemStruct *GetCheckpoint(void) { return checkPoint; }

-    
+

     // Calculated from the request size and any padding needed
     // before the final marker.
     static size_t PaddedSize (const size_t reqSize);
     // Calculated from the request size and any padding needed
     // before the final marker.
     static size_t PaddedSize (const size_t reqSize);


@@ -268,16 +281,16 @@ private:
 };
 
 // Output a debug message, in a system dependent fashion.
 };
 
 // Output a debug message, in a system dependent fashion.

-void WXDLLEXPORT wxTrace(const char *fmt ...);
-void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...);
+void WXDLLEXPORT wxTrace(const wxChar *fmt ...);
+void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...);

 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
 #else // else part for the #if __WXDEBUG__
 
 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
 #else // else part for the #if __WXDEBUG__
 

-inline void wxTrace(const char *WXUNUSED(fmt)) {}
-inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
+inline void wxTrace(const wxChar *WXUNUSED(fmt)) {}
+inline void wxTraceLevel(int WXUNUSED(level), const wxChar *WXUNUSED(fmt)) {}

 
 #define WXTRACE TRUE ? (void)0 : wxTrace
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 
 #define WXTRACE TRUE ? (void)0 : wxTrace
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel