Ok. Vidwin works again on Windows.

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 94356b2dd85b318fc961774f57a52df843278fc6..48fb5c449e9277ddba8338c67692ae9449ad0984 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -68,21 +68,22 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 
 // 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);
+WXDLLEXPORT void * operator new (size_t size, wxChar * 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, wxChar * 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, wxChar*, int);
-    void operator delete[](void *buf, wxChar*, int);
+    WXDLLEXPORT void operator delete(void *buf, wxChar*, int);
+    WXDLLEXPORT void operator delete[](void *buf, wxChar*, int);
 #endif
 
 #endif
@@ -195,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