*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/memory.h

@@ -68,9 +68,10 @@ 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);
+#if !defined(__VISAGECPP__)
 void operator delete (void * buf);
+#endif
 
 #if wxUSE_ARRAY_MEMORY_OPERATORS
     void * operator new[] (size_t size);
@@ -217,7 +218,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);

include/wx/os2/setup.h

@@ -70,6 +70,8 @@
 #define wxUSE_DRAG_AND_DROP 1
                                 // 0 for no drag and drop
 
+#define wxUSE_TOOLBAR       1
+                                    // Define 1 to use toolbar classes
 #define wxUSE_BUTTONBAR     1
                                     // Define 1 to use buttonbar classes (enhanced toolbar
                                     // for MS Windows)