*** 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);

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)

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)

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:
 

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):

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(