- 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
This commit is contained in:
parent
f043bf8d19
commit
a246f95e96
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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));
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user