Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes from Arjan Knepper for D Mars

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2004-02-02 14:16:32 +00:00
parent 93f6e6df19
commit 013675321e
10 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/filefn.h
View File

@@ -35,7 +35,7 @@
typedef _off_t off_t; typedef _off_t off_t;
#elif defined(__BORLANDC__) && defined(__WIN16__) #elif defined(__BORLANDC__) && defined(__WIN16__)
typedef long off_t; typedef long off_t;
#elif defined(__SC__) #elif (defined(__SC__) && !defined(__DIGITALMARS__))
typedef long off_t; typedef long off_t;
#elif defined(__MWERKS__) && !defined(__INTEL__) #elif defined(__MWERKS__) && !defined(__INTEL__)
typedef long off_t; typedef long off_t;

2
include/wx/platform.h
View File

@@ -302,7 +302,7 @@
This macro can be used to check that the version of mingw32 compiler is This macro can be used to check that the version of mingw32 compiler is
at least maj.min at least maj.min
*/ */
#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ ) || defined(__DIGITALMARS__) #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
#include "wx/msw/gccpriv.h" #include "wx/msw/gccpriv.h"
#else #else
#undef wxCHECK_W32API_VERSION #undef wxCHECK_W32API_VERSION

4
lib/_sc/wsock32_sc.def
View File

@@ -30,3 +30,7 @@ EXPORTS
_shutdown@8 = shutdown _shutdown@8 = shutdown
_closesocket@4 = closesocket _closesocket@4 = closesocket
_WSAAsyncSelect@16 = WSAAsyncSelect _WSAAsyncSelect@16 = WSAAsyncSelect
_setsockopt@20 = setsockopt

2
src/common/cmndata.cpp
View File

@@ -61,7 +61,7 @@
#include <commdlg.h> #include <commdlg.h>
#endif #endif
#if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__) #if defined(__WATCOMC__) || (defined(__SC__) && !defined(__DIGITALMARS__)) || defined(__SALFORDC__)
#include <windowsx.h> #include <windowsx.h>
#include <commdlg.h> #include <commdlg.h>
#endif #endif

2
src/msw/dc.cpp
View File

@@ -620,7 +620,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
wxCoord x2 = x1 + width, wxCoord x2 = x1 + width,
y2 = y1 + height; y2 = y1 + height;
#if defined(__WIN32__) && !defined(__SC__) && !defined(__WXMICROWIN__) #if defined(__WIN32__) && (!defined(__SC__) || defined(__DIGITALMARS__)) && !defined(__WXMICROWIN__)
RECT rect; RECT rect;
rect.left = x1; rect.left = x1;
rect.top = y1; rect.top = y1;

2
src/msw/gdiimage.cpp
View File

@@ -534,7 +534,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
// note that we can't just always call LoadImage() because it seems to do // note that we can't just always call LoadImage() because it seems to do
// some icon rescaling internally which results in very ugly 16x16 icons // some icon rescaling internally which results in very ugly 16x16 icons
#if defined(__WIN32__) && !defined(__SC__) #if defined(__WIN32__) && (!defined(__SC__) || defined (__DIGITALMARS__) )
if ( hasSize ) if ( hasSize )
{ {
hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON, hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,

2
src/msw/ownerdrw.cpp
View File

@@ -228,7 +228,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
// get drawn embossed? How can we tell DrawState that we don't want the // get drawn embossed? How can we tell DrawState that we don't want the
// embossing? // embossing?
#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__) #if defined(__WIN32__) && (!defined(__SC__) || defined (__DIGITALMARS__)) && !defined(__TWIN32__)
#define O_DRAW_NATIVE_API // comments below explain why I use it #define O_DRAW_NATIVE_API // comments below explain why I use it
#endif #endif

3
src/msw/tbar95.cpp
View File

@@ -50,9 +50,6 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Toolbar define value missing // Toolbar define value missing
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__DIGITALMARS__)
#define CCS_VERT 0x00000080L
#endif
#include "wx/msw/private.h" #include "wx/msw/private.h"

2
src/msw/toplevel.cpp
View File

@@ -193,7 +193,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
if ( exflags ) if ( exflags )
{ {
#if !defined(__WIN16__) && !defined(__SC__) #if !defined(__WIN16__) && (!defined(__SC__) || defined (__DIGITALMARS__))
if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ) if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
{ {
if ( style & wxFRAME_TOOL_WINDOW ) if ( style & wxFRAME_TOOL_WINDOW )

2
src/msw/utils.cpp
View File

@@ -1022,7 +1022,7 @@ wxString wxGetOsDescription()
int wxGetOsVersion(int *majorVsn, int *minorVsn) int wxGetOsVersion(int *majorVsn, int *minorVsn)
{ {
#if defined(__WIN32__) && !defined(__SC__) #if defined(__WIN32__) && (!defined(__SC__) || defined(__DIGITALMARS__))
static int ver = -1, major = -1, minor = -1; static int ver = -1, major = -1, minor = -1;
if ( ver == -1 ) if ( ver == -1 )