wxGridCellEditor::PaintBackground() added

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 85d2e2954f3da120e012078d20e0cbd075f078ff..21b9545a961b818e48fd0212b1149c6da340be85 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -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);
 
 // 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, wxChar * fileName, int lineNum);
+#if !defined(__VISAGECPP__)

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

+#endif

 
 #if wxUSE_ARRAY_MEMORY_OPERATORS
 
 #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)
 #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
 #endif
 
 #endif


@@ -217,7 +219,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);