applied patch 473558: fixes for CW compilation under MSW

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index 6556f39cd6cc9c0ed9ca78ad0bdc026a60980565..c2aaa0c09b727ef7289ece05c2a3d4526bda9aad 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -71,7 +71,8 @@ public:
         wxASSERT_MSG( wcs, wxT("NULL string in wxWCharBuffer") );
 
         if (wcs) {
-#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
           size_t siz = (std::wcslen(wcs)+1)*sizeof(wchar_t);
 #else
           size_t siz = (::wcslen(wcs)+1)*sizeof(wchar_t);

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index d4e1cbe48c40a62d6a04344d05ca4bd601554d1b..75665d066dbcfc49be3a9c8eec22db1629914c47 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -66,7 +66,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 // ----------------------------------------------------------------------------
 
 // Microsoft compiler loves underscores, feed them to it
-#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 )
+#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
     // functions
     #define   wxClose      _close
     #define   wxRead       _read

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 667b99a32c19d318f63d23ac5294c4b3805a03ac..0973ec9c3854675aea09a57562f8c9a801bc87f7 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -88,6 +88,9 @@
 #ifndef __MWERKS__
     #include  <sys/types.h>   // needed for stat
     #include  <sys/stat.h>    // stat
+#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat
 #endif
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index ba47b870f989fdabf4a8620f871acba5031daa3e..d0cda3912dd7029039d1fdd41e62ec18a6aa00c2 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -28,7 +28,12 @@
 #if wxUSE_LONGLONG
 #include "wx/longlong.h"
 
+#if defined(__MWERKS__) && defined(__WXMSW__)
+#include <string.h>     // for memset()
+#else
 #include <memory.h>     // for memset()
+#endif
+
 #include <math.h>       // for fabs()
 
 // ============================================================================

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 5f5ae4b89fabbe28aadd283b5a6fa2f8b8de9b24..4a7c55d033be68cabba7ec81a290c00dafff3cd0 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -764,7 +764,8 @@ public:
 
     size_t WC2MB(char *buf, const wchar_t *psz, size_t n)
     {
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
         size_t inbuf = std::wcslen(psz);
 #else
         size_t inbuf = ::wcslen(psz);
@@ -898,7 +899,8 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
         return m_cset->WC2MB(buf, psz, n);
 
     // latin-1 (direct)
-#if defined(__BORLANDC__) && (__BORLANDC__ > 0x530)
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
     size_t len=std::wcslen(psz);
 #else
     size_t len=::wcslen(psz);

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 0a9261b9122ad49ae400ca0f5986252391435308..3ff1adf9d1dc7c50ce30dfb3b8e020532e8fed06 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -60,6 +60,11 @@
 #  endif
 #endif
 
+#if defined(__MWERKS__) && defined(__WXMSW__)
+#   undef HAVE_FTIME
+#   undef HAVE_GETTIMEOFDAY
+#endif
+
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index 2d8604909460cc0e8402f4b3ff047bba9ad1a6e7..342acc11f66e42816d3cfeabb9ced2588fd51910 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -169,10 +169,11 @@ typedef short INT16;
 #ifdef XMD_H
 /* X11/xmd.h correctly defines INT32 */
 #define INT32_DEFINED
-#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) || \
-      wxCHECK_W32API_VERSION( 0, 5 ) || \
-      ((defined(__MINGW32__) || defined(__CYGWIN__)) \
-       && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>95))))
+#elif (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550) \
+      || wxCHECK_W32API_VERSION( 0, 5 ) \
+      || ((defined(__MINGW32__) || defined(__CYGWIN__)) \
+      && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>95)))) \
+      || (defined(__MWERKS__) && defined(__WXMSW__))
 
 /* INT32 is defined in windows.h  for these compilers */
 #define INT32_DEFINED
@@ -263,6 +264,10 @@ typedef unsigned int JDIMENSION;
 #endif
 
 
+#if (defined(__MWERKS__) && defined(__WXMSW__))
+#define HAVE_BOOLEAN
+#endif
+
 /*
  * On a few systems, type boolean and/or its values FALSE, TRUE may appear
  * in standard header files.  Or you may have conflicts with application-

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index b8993a12c4f19b367c2a39d6c65d46c20aea76cf..7d1870e9a20729f7c4cb036f3c537bbad99a6952 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -468,7 +468,8 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                         break;
 #if !defined(__WATCOMC__) && ! (defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                     case CF_UNICODETEXT:
-#if (defined(__BORLANDC__) && (__BORLANDC__ > 0x530))
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else
                         size = ::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 3c1a1b65321ef56c8aaac73ce4df601465d3338c..afa81726ae1e6f8346105be550dcb6e4f442c67f 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -61,6 +61,17 @@
 #include "wx/msw/dib.h"
 #include "wx/app.h"         // for GetComCtl32Version
 
+#if defined(__MWERKS__) && defined(__WXMSW__)
+// including <windef.h> for max definition doesn't seem
+// to work using CodeWarrior 6 Windows. So we define it
+// here. (Otherwise we get a undefined identifier 'max'
+// later on in this file.) (Added by dimitri@shortcut.nl)
+#   ifndef max
+#       define max(a,b)            (((a) > (b)) ? (a) : (b))
+#   endif
+
+#endif
+
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------