From: Stefan Csomor Date: Fri, 20 Aug 1999 15:36:30 +0000 (+0000) Subject: CW Pro 5 Adaptions (the .old.mcp are the Pro 4 Files) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/585ae8cbc0ba875d2b0e836d5db429e702f0c289?ds=inline 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 f80688c80a..bb9ac4effa 100644 --- 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 17e349a051..e2378b42d3 100644 --- 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 03445fa3da..70d3342c60 100644 --- 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 799425a95f..8bd9bdd3d4 100644 --- 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 b332079e91..dd2c3fa06c 100644 --- a/include/wx/wx_cw_cm.h +++ b/include/wx/wx_cw_cm.h @@ -26,6 +26,12 @@ #ifdef __WXMSW__ #include + #include + #if defined( __MSL__ ) && __MSL__ >= 0x5012 + #define fileno _fileno + #define fdopen _fdopen + #define tell _tell + #endif #elif defined( __WXMAC__) #include #endif diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 48c1fd1c60..f764e67eb7 100644 --- 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 index 0000000000..f49d880a8e 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 index 0000000000..cf70f26891 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 de7d7a6a09..136fff7021 100644 --- 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 #else #include diff --git a/src/common/paper.cpp b/src/common/paper.cpp index 3ab79c9270..b2c77b66af 100644 --- 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 c595157f3f..e342567285 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -36,7 +36,9 @@ #include #include +#ifndef __MWERKS__ #include +#endif #ifndef __WINDOWS__ #include diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp index 336273ba87..1fdb91028c 100644 --- a/src/generic/helpwxht.cpp +++ b/src/generic/helpwxht.cpp @@ -36,7 +36,9 @@ #include #include +#ifndef __MWERKS__ #include +#endif #ifndef __WINDOWS__ # include diff --git a/src/make_cw.mcp b/src/make_cw.mcp index ee0e7052f6..798a8870b1 100644 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 index 0000000000..ee0e7052f6 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 c838b38d78..5263230b30 100644 --- 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