Moved wxGLCanvas to more normal positions

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 23f64dca35b62e005b6e49b87113ac885ddc6608..48fb5c449e9277ddba8338c67692ae9449ad0984 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -40,7 +40,7 @@
 
 #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.
@@ -68,20 +68,22 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
+WXDLLEXPORT void * operator new (size_t size, wxChar * fileName, int lineNum);
 
-void * operator new (size_t size, char * fileName, int lineNum);
+#if !defined(__VISAGECPP__)
 void operator delete (void * buf);
+#endif
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS
-    void * operator new[] (size_t size);
-    void * operator new[] (size_t size, char * fileName, int lineNum);
-    void operator delete[] (void * buf);
+    WXDLLEXPORT void* operator new[] (size_t size);
+    WXDLLEXPORT void* operator new[] (size_t size, wxChar * fileName, int lineNum);
+    WXDLLEXPORT void operator delete[] (void * buf);
 #endif
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-    void operator delete(void *buf, char*, int);
-    void operator delete[](void *buf, char*, int);
+    WXDLLEXPORT void operator delete(void *buf, wxChar*, int);
+    WXDLLEXPORT void operator delete[](void *buf, wxChar*, int);
 #endif
 
 #endif
@@ -142,7 +144,7 @@ public:
     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.
@@ -194,6 +196,8 @@ protected:
     static int debugLevel;
     static bool debugOn;
 
+       static int m_balign;                    // byte alignment
+       static int m_balignmask;                // mask for performing byte alignment
 public:
     // Set a checkpoint to dump only the memory from
     // a given point
@@ -217,7 +221,7 @@ public:
 
     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);
@@ -280,16 +284,16 @@ private:
 };
 
 // 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__
 
-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