CW Pro 5 Adaptions (the .old.mcp are the Pro 4 Files)

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f80688c80a22703fea7d8b57848be4b123a6a487..bb9ac4effae41eaa6cb7e19397a8062c97a178bd 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -239,7 +239,7 @@
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL
     #if defined( __MWERKS__ )
-        #if (__MWERKS__ >= 0x1000) && !__option(bool)
+        #if (__MWERKS__ >= 0x1000) && __option(bool)
             #define HAVE_BOOL
         #endif
     #elif defined(__VISUALC__) && (__VISUALC__ == 1020)

diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h
index 17e349a05106efdf789f6cfdeed427e37dd37c01..e2378b42d3e6ba34b2d6607117551027296f55f6 100644 (file)
--- a/include/wx/generic/splitter.h
+++ b/include/wx/generic/splitter.h
@@ -281,7 +281,11 @@ public:
     }
 
 private:
+#ifdef __MWERKS__
+    friend class wxSplitterWindow;
+#else
     friend wxSplitterWindow;
+#endif
 
     // data for the different types of event
     union

diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h
index 03445fa3da06ceeadc506923e6ea1fd69802fc88..70d3342c60044d1f9902fdfccca98ae86ab4f952 100644 (file)
--- a/include/wx/mimetype.h
+++ b/include/wx/mimetype.h
@@ -32,7 +32,11 @@ class wxMimeTypesManagerImpl;
 // the accessors *must* be checked!
 class WXDLLEXPORT wxFileType
 {
+#ifdef __MWERKS__
+friend class wxMimeTypesManagerImpl;  // it has access to m_impl
+#else
 friend wxMimeTypesManagerImpl;  // it has access to m_impl
+#endif
 
 public:
     // An object of this class must be passed to Get{Open|Print}Command. The

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 799425a95fe335cb6b22e91a25c42494af899f18..8bd9bdd3d46ce782c96c2054abc833e2b9ab3cea 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -41,7 +41,12 @@
 
 class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {
-friend wxTreeCtrl;
+#ifdef __MWERKS__
+    friend class wxTreeCtrl;
+#else
+    friend wxTreeCtrl;
+#endif
+
 public:
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 

diff --git a/include/wx/wx_cw_cm.h b/include/wx/wx_cw_cm.h
index b332079e91e5fd7531d24bef86f28d37bbd9de6b..dd2c3fa06c5fcc4b8f98af0af2e26e6ac1a8a373 100644 (file)
--- a/include/wx/wx_cw_cm.h
+++ b/include/wx/wx_cw_cm.h
@@ -26,6 +26,12 @@
 
 #ifdef __WXMSW__
     #include <ansi_prefix.win32.h>
+    #include <ansi_parms.h>
+    #if defined( __MSL__ ) && __MSL__ >= 0x5012
+                       #define fileno  _fileno
+                       #define fdopen  _fdopen
+                       #define tell    _tell
+    #endif
 #elif defined( __WXMAC__)
     #include <ansi_prefix.mac.h>
 #endif

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 48c1fd1c60f10430eff0769b3f88e59f4e1edef3..f764e67eb7856f5343dc9da207be15e7371a4727 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -341,7 +341,7 @@ typedef unsigned char   wxUChar;
 #if !defined(wxStricmp) && !wxUSE_UNICODE
 #  if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__)
 #    define wxStricmp stricmp
-#  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS) && defined(__INTEL__))
+#  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
 #    define wxStricmp _stricmp
 #  elif defined(__UNIX__) || defined(__GNUWIN32__)
 #    define wxStricmp strcasecmp

diff --git a/samples/forty/make_cw.mcp b/samples/forty/make_cw.mcp
new file mode 100644 (file)
index 0000000..f49d880
Binary files /dev/null and b/samples/forty/make_cw.mcp differ

diff --git a/samples/forty/make_cw.old.mcp b/samples/forty/make_cw.old.mcp
new file mode 100644 (file)
index 0000000..cf70f26
Binary files /dev/null and b/samples/forty/make_cw.old.mcp differ

diff --git a/samples/forty/scoredg.cpp b/samples/forty/scoredg.cpp
index de7d7a6a09d1b496a6e23b1915e5ac5ac9c28c22..136fff7021434633fbbc25dbf59bd243bbc8e929 100644 (file)
--- a/samples/forty/scoredg.cpp
+++ b/samples/forty/scoredg.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)
 #include <strstrea.h>
 #else
 #include <strstream.h>

diff --git a/src/common/paper.cpp b/src/common/paper.cpp
index 3ab79c92708551ab5a77a0bc7debf943dcc8044b..b2c77b66af66cab8756301e58c984889d092f86d 100644 (file)
--- a/src/common/paper.cpp
+++ b/src/common/paper.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        paper.cpp
 // Purpose:     Paper size classes
-// Author:      Julian Smart
+// Author:      Julian Smart 
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index c595157f3fdbd054954355e227630982a5a099ad..e3425672855779efda748baebbd1fa8dc3af9f74 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -36,7 +36,9 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#ifndef __MWERKS__
 #include <sys/stat.h>
+#endif
 
 #ifndef __WINDOWS__
     #include   <unistd.h>

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 336273ba87a41b305903f88daf91842e3ca1028b..1fdb91028cb753d66266cf2f3835b721b035f50f 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -36,7 +36,9 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#ifndef __MWERKS__
 #include <sys/stat.h>
+#endif
 
 #ifndef __WINDOWS__
 #   include   <unistd.h>

diff --git a/src/make_cw.mcp b/src/make_cw.mcp
index ee0e7052f6eb9fc77f4553951d1bce552979b9e7..798a8870b1b1bedd200fcc8de21383aac0f24490 100644 (file)
Binary files a/src/make_cw.mcp and b/src/make_cw.mcp differ

diff --git a/src/make_cw.old.mcp b/src/make_cw.old.mcp
new file mode 100644 (file)
index 0000000..ee0e705
Binary files /dev/null and b/src/make_cw.old.mcp differ

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index c838b38d78a2f0ea1562ba99903d2062a1bb829a..5263230b3078da88fbd387f91c764f475f0f6554 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -667,7 +667,7 @@ bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
 
        case VT_BOOL:
                {
-#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000)) //GC
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC
 #ifndef HAVE_BOOL // Can't use bool operator if no native bool type
                        variant = (long) (oleVariant.bool != 0);
 #else