update to make digitalmars compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-04-19 18:15:17 +00:00
parent e668651137
commit 4ce1efe123
15 changed files with 97 additions and 56 deletions

View File

@@ -157,6 +157,9 @@
#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
// Watcom 11+ supports bool
#define HAVE_BOOL
#elif defined(__DIGITALMARS__)
// DigitalMars supports bool
#define HAVE_BOOL
#elif defined(__GNUWIN32__) || defined(__MINGW32__) || defined(__CYGWIN__)
// Cygwin supports bool
#define HAVE_BOOL

View File

@@ -394,9 +394,10 @@ public:
// deprecated methods, don't use any more
// --------------------------------------
#ifndef __DIGITALMARS__
wxString GetPath( bool withSep, wxPathFormat format = wxPATH_NATIVE ) const
{ return GetPath(withSep ? wxPATH_GET_SEPARATOR : 0, format); }
#endif
wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
{ return GetPath(wxPATH_GET_SEPARATOR, format); }

View File

@@ -50,7 +50,9 @@ public:
wxBitmap(const char bits[], int width, int height, int depth = 1);
// Initialize with XPM data
#ifndef __DIGITALMARS__
wxBitmap(const char **data) { CreateFromXpm(data); }
#endif
wxBitmap(char **data) { CreateFromXpm((const char **)data); }
// Load a file or resource

View File

@@ -54,7 +54,9 @@ public:
// from raw data
wxIcon(const char bits[], int width, int height);
// from XPM data
#ifndef __DIGITALMARS__
wxIcon(const char **data) { CreateIconFromXpm(data); }
#endif
wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
// from resource/file
wxIcon(const wxString& name,

View File

@@ -159,7 +159,7 @@ typedef struct tagNMLVDISPINFOW {
#endif
#endif
#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__) || defined (__BORLANDC__)) && !defined(HDN_GETDISPINFOW)
#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__) || defined(__DIGITALMARS__) || defined (__BORLANDC__)) && !defined(HDN_GETDISPINFOW)
#define HDN_GETDISPINFOW (HDN_FIRST-29)
#if !wxCHECK_W32API_VERSION(2, 2)
typedef struct {

View File

@@ -297,5 +297,11 @@
#define wxCHECK_W32API_VERSION(maj, min) (0)
#endif
#ifdef __SC__
#ifdef __DMC__
#define __DIGITALMARS__
#endif
#endif
#endif /* _WX_PLATFORM_H_ */