*** empty log message ***

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 85d2e2954f3da120e012078d20e0cbd075f078ff..94356b2dd85b318fc961774f57a52df843278fc6 100644 (file)
--- a/include/wx/memory.h
+++ b/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);

diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h
index 52632098a10b597292691bf0ccb51f39a46daadb..f3c14fe1238d1f8167a721171524642a2a02c3a0 100644 (file)
--- a/include/wx/os2/setup.h
+++ b/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)

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index d8ad194662daaa6e3d84e76511e39df0035f7b5a..0f51b89b6d2cd00ea90d8119c1f3c5d81a890dbf 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -988,6 +988,7 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum)
 }
 #endif
 
+#if !defined(__VISAGECPP__) // already defines this by default
 void operator delete (void * buf)
 {
 #ifdef NO_DEBUG_ALLOCATION
@@ -996,6 +997,7 @@ void operator delete (void * buf)
   wxDebugFree(buf);
 #endif
 }
+#endif
 
 // VC++ 6.0
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index d99173552de0c4646469ac9dc1bcd02d0c53574b..465670a1269222f3150da812c37cb2870e550a61 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -37,6 +37,7 @@
 #include "wx/html/htmlwin.h"
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
+#include "wx/toolbar.h"
 
 // Bitmaps:
 

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 6b9f7dcff655675fd3ec30f3b2c8a0ca186ed635..cde236d408f7653596078f99835e57aef0bfdb73 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -534,7 +534,6 @@ HTMLOBJS = \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_tables.obj \
-  ..\html\$D\search.obj \
   ..\html\$D\winpars.obj
 
 HTMLLIBOBJS = \
@@ -554,7 +553,6 @@ HTMLLIBOBJS = \
   m_list.obj \
   m_pre.obj \
   m_tables.obj \
-  search.obj \
   winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
@@ -719,7 +717,6 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_tables.obj
-  copy ..\html\$D\search.obj
   copy ..\html\$D\winpars.obj
 
 $(OS2LIBOBJS1):

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index e837dcc66a569054d7137d2e2fd7215ced29ed13..f6c3a5b4376eece26d00649a30284c67878e2492 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -102,10 +102,14 @@ bool wxGetHostName(
 // Get user ID e.g. jacs
 bool wxGetUserId(
   wxChar*                           zBuf
-, int                               nMaxSize
+, int                               nType
 )
 {
-   return(U32ELOCL((unsigned char*)zBuf, (unsigned long *)&nMaxSize));
+    long                            lrc;
+    // UPM procs return 0 on success
+    lrc = U32ELOCU((unsigned char*)zBuf, (unsigned long *)&nType);
+    if (lrc == 0) return TRUE;
+    return FALSE;
 }
 
 bool wxGetUserName(