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

fix bugs when compiling with dmars

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-08-14 10:01:49 +00:00
parent 14112c7b78
commit 50165591a5
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/private.h
View File

@@ -91,6 +91,11 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
#define CASTWNDPROC (WndProcCast) #define CASTWNDPROC (WndProcCast)
//is this the right place; doing a #include...missing.h gives errors (CE)
#if defined(__DIGITALMARS__)
#define CCS_VERT 0x00000080L
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// some stuff for old Windows versions (FIXME: what does it do here??) // some stuff for old Windows versions (FIXME: what does it do here??)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

5
src/msw/app.cpp
View File

@@ -88,7 +88,7 @@
#include "wx/msw/wrapcctl.h" #include "wx/msw/wrapcctl.h"
#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \ #if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
!defined(__CYGWIN__) && !defined(__WXWINCE__) && \ !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
(!defined(_MSC_VER) || (_MSC_VER > 1100)) (!defined(_MSC_VER) || (_MSC_VER > 1100))
#include <shlwapi.h> #include <shlwapi.h>
#endif #endif
@@ -847,7 +847,8 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
/* static */ /* static */
int wxApp::GetComCtl32Version() int wxApp::GetComCtl32Version()
{ {
#if defined(__WXMICROWIN__) || defined(__WXWINCE__) //FIX ME FOR DIGITALMARS!!
#if defined(__WXMICROWIN__) || defined(__WXWINCE__) || defined(__DIGITALMARS__)
return 0; return 0;
#else #else
// cache the result // cache the result

3
src/msw/makefile.sc
View File

@@ -14,7 +14,7 @@ WXDIR = ..\..
include ..\makesc.env include ..\makesc.env
DEBUG=1 DEBUG=0
LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
@@ -133,6 +133,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
$(COMMDIR)\imagtiff.obj \ $(COMMDIR)\imagtiff.obj \
$(COMMDIR)\imagxpm.obj \ $(COMMDIR)\imagxpm.obj \
$(COMMDIR)\intl.obj \ $(COMMDIR)\intl.obj \
$(COMMDIR)\init.obj \
$(COMMDIR)\ipcbase.obj \ $(COMMDIR)\ipcbase.obj \
$(COMMDIR)\layout.obj \ $(COMMDIR)\layout.obj \
$(COMMDIR)\lboxcmn.obj \ $(COMMDIR)\lboxcmn.obj \

3
src/msw/tbar95.cpp
View File

@@ -1009,7 +1009,8 @@ wxSize wxToolBar::GetToolSize() const
{ {
// TB_GETBUTTONSIZE is supported from version 4.70 // TB_GETBUTTONSIZE is supported from version 4.70
#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \ #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
&& !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
&& !defined (__DIGITALMARS__)
if ( wxTheApp->GetComCtl32Version() >= 470 ) if ( wxTheApp->GetComCtl32Version() >= 470 )
{ {
DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0); DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);