From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 21 Dec 1998 08:36:48 +0000 (+0000)
Subject: CW Win32 support
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/518f33a4e50585cab19757375a2c348e61d2594f?ds=sidebyside

CW Win32 support


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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index a43ff851bb..d3ba9b0e0e 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -311,8 +311,10 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
 // where should i put this? we need to make sure of this as it breaks
 // the <iostream> code.
 #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#ifndef __MWERKS__
 #undef __WXDEBUG__
 #endif
+#endif
 
 // Callback function type definition
 typedef void (*wxFunction) (wxObject&, wxEvent&);
diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 9186c620d9..7d101628e6 100644
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -30,8 +30,13 @@ public:
   wxDC(void);
   ~wxDC(void);
 
+#ifdef WX_COMP_INLINE_NO_CLASS
+  inline void BeginDrawing(void) {}
+  inline void EndDrawing(void) {}
+#else
   inline void wxDC::BeginDrawing(void) {}
   inline void wxDC::EndDrawing(void) {}
+#endif
 
   virtual void FloodFill(long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE) ;
   inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
@@ -265,7 +270,11 @@ public:
   }
 
   // This should probably be made available on other platforms
+#ifdef WX_COMP_INLINE_NO_CLASS
+  int GetDepth(void) const ;
+#else
   int wxDC::GetDepth(void) const ;
+#endif
 
 // Implementation
   virtual void SetRop(WXHDC cdc);
diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index e780f78018..0aa31b8cc1 100644
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -133,10 +133,15 @@
 #define wxUSE_ODBC                   1
                                     // Define 1 to use ODBC classes
 
+#ifndef __MWERKS__
 #define wxUSE_IOSTREAMH     1
+#else
+#define wxUSE_IOSTREAMH     0
+#endif
                                   // VC++ 4.2 and above allows <iostream> and <iostream.h>
                                   // but you can't mix them. Set to 1 for <iostream.h>,
                                   // 0 for <iostream>
+                      
 
 #define wxUSE_WXCONFIG      1
                                   // if enabled, compiles built-in OS independent wxConfig
diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 2b9d28e6a7..a118da0480 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -29,7 +29,7 @@
 //
 //
 
-#ifdef __GNUWIN32__
+#if defined( __GNUWIN32__ ) || defined(__MWERKS__)
 #include <wx/msw/gnuwin32/winresrc.h>
 #else
 #include <windows.h>
diff --git a/include/wx/wx_cw_d.h b/include/wx/wx_cw_d.h
index 24db04b373..275e130219 100644
--- a/include/wx/wx_cw_d.h
+++ b/include/wx/wx_cw_d.h
@@ -18,6 +18,8 @@
 	#error "this file is only for builds with Metrowerks CodeWarrior"
 #endif 
 
+#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
+
 #if (__MWERKS__ < 0x0900) || macintosh
 	#define __MAC__
 	#define __WXMAC__
@@ -41,12 +43,18 @@
 	#error unknown MW compiler
 #endif
 
-#define __WXDEBUG__ 1
-#define WXDEBUG 1
-
+#define __WXDEBUG__
+#define USE_DEFINE
 // in order to avoid problems further down in wxWindows
 
-char *strdup(const char *s) ;
-
+#ifdef __cplusplus
+extern "C" 
+{
+#endif
+	char *strdup(const char *s) ;
+	int	isascii( int c ) ;
+#ifdef __cplusplus
+} ;
+#endif
 #endif
     // _WX_CW__