From: Václav Slavík Date: Sat, 8 Dec 2001 00:26:05 +0000 (+0000) Subject: - added precompiled headers code X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a246f95e96183bc81bf5be5e1927d9bb53094f55 - 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 ae9430e41d..2dc2f1924b 100644 --- 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 37dbc1944e..6a99ec80ee 100644 --- 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 cc8dd3fb38..ff9f73343d 100644 --- 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 - // ---------------------------------------------------------------------------- // wxFontRefData // ---------------------------------------------------------------------------- diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp index 58c37ac357..316d2c5d54 100644 --- 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 18c599c477..e46418d070 100644 --- 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 7629ef45fc..2002add8b8 100644 --- 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 b99f6e5ee5..a4142e571a 100644 --- 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 a1b0ad7972..5452e675d0 100644 --- 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 6459d48004..52b214cfd4 100644 --- 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 }