- added precompiled headers code

- more Watcom+DOS+MGL fixes

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

diff --git a/src/mgl/clipbrd.cpp b/src/mgl/clipbrd.cpp
index ae9430e41df420c0eb4aeabe69dc79a3db039687..2dc2f1924b34724d93d1525c36c0a9fae05022e9 100644 (file)
--- a/src/mgl/clipbrd.cpp
+++ b/src/mgl/clipbrd.cpp
@@ -11,6 +11,13 @@
 #pragma implementation "clipbrd.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/clipbrd.h"
 
 #if wxUSE_CLIPBOARD

diff --git a/src/mgl/data.cpp b/src/mgl/data.cpp
index 37dbc1944ef2d0d07bf7e36151256df266057690..6a99ec80eefcb5064e554cf2471f79a4bc9f90ee 100644 (file)
--- a/src/mgl/data.cpp
+++ b/src/mgl/data.cpp
@@ -11,6 +11,13 @@
 // #pragma implementation
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"

diff --git a/src/mgl/font.cpp b/src/mgl/font.cpp
index cc8dd3fb38b87dd8fd77236be568177c94ca73b1..ff9f73343d4d64d5a113834a7a3ffe666976a056 100644 (file)
--- a/src/mgl/font.cpp
+++ b/src/mgl/font.cpp
@@ -18,6 +18,13 @@
     #pragma implementation "font.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/font.h"
 #include "wx/fontutil.h"
 #include "wx/cmndata.h"
@@ -27,8 +34,6 @@
 #include "wx/tokenzr.h"
 #include "wx/settings.h"
 
-#include <strings.h>
-
 // ----------------------------------------------------------------------------
 // wxFontRefData
 // ----------------------------------------------------------------------------

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index 58c37ac3574957cfe7db2dba5de787a829b67b56..316d2c5d543c28b014544917d500401066bd7a7b 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -19,6 +19,13 @@
     #pragma implementation "fontenum.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 18c599c4774046e39b58b403f9f35f3f04abd481..e46418d07067f6967f53c9c68366b28029cfd2d8 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -12,6 +12,13 @@
 #pragma implementation "pen.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/pen.h"
 #include "wx/bitmap.h"
 #include "wx/mgl/private.h"

diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
index 7629ef45fce6f852a7296d87189a68bfcc7c3a39..2002add8b896bce706914540840cbf76c3b5c6db 100644 (file)
--- a/src/mgl/region.cpp
+++ b/src/mgl/region.cpp
@@ -324,7 +324,7 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
 
 static wxRegionRectList *gs_rectList;
 
-static void wxMGL_region_callback(const rect_t *r)
+static void MGLAPI wxMGL_region_callback(const rect_t *r)
 {
     gs_rectList->Append(new wxRect(r->left, r->top, 
                                    r->right - r->left, r->bottom - r->top));

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index b99f6e5ee5eefb7686157f60d193e2c62c6ca5a2..a4142e571a3700bdfe2e3f2565e07a19309b583a 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -11,6 +11,13 @@
 #pragma implementation "settings.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/settings.h"
 #include "wx/colour.h"
 #include "wx/font.h"

diff --git a/src/mgl/timer.cpp b/src/mgl/timer.cpp
index a1b0ad7972f0acffc888283ec7d8d44f186b16d2..5452e675d0e34b9c3b57aa8fad46baaed70104b9 100644 (file)
--- a/src/mgl/timer.cpp
+++ b/src/mgl/timer.cpp
@@ -12,6 +12,13 @@
 #pragma implementation "timer.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/timer.h"
 
 #if wxUSE_TIMER

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 6459d48004dab77f1b7c4d9e84c4e004f1594912..52b214cfd4ef27b0baf8623aa3aca1985edd7073 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/utils.h"
 #include "wx/string.h"
 
@@ -81,17 +88,21 @@ int wxDisplayDepth()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
-  if ( majorVsn )
-      *majorVsn = MGL_RELEASE_MAJOR;
-  if ( minorVsn )
-      *minorVsn = MGL_RELEASE_MINOR;
+    if ( majorVsn )
+        *majorVsn = MGL_RELEASE_MAJOR;
+    if ( minorVsn )
+        *minorVsn = MGL_RELEASE_MINOR;
 
 #if defined(__UNIX__)
-  return wxMGL_UNIX;
+    return wxMGL_UNIX;
 #elif defined(__OS2__)
-  return wxMGL_OS2;
+    return wxMGL_OS2;
 #elif defined(__WIN32__)
-  return wxMGL_WIN32;
+    return wxMGL_WIN32;
+#elif defined(__DOS__)
+    return wxMGL_DOS;
+#else
+    #error Platform not supported by wxMGL!
 #endif
 }