From 50165591a5f7de9566fc3bb4fe1ec7e4673d13be Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Thu, 14 Aug 2003 10:01:49 +0000
Subject: [PATCH] fix bugs when compiling with dmars

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/private.h | 5 +++++
 src/msw/app.cpp          | 7 ++++---
 src/msw/makefile.sc      | 3 ++-
 src/msw/tbar95.cpp       | 3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index b092c66a51..14fc50144e 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -91,6 +91,11 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 #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??)
 // ---------------------------------------------------------------------------
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index e553e03534..7af9c7108a 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -88,8 +88,8 @@
 #include "wx/msw/wrapcctl.h"
 
 #if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
-    !defined(__CYGWIN__) && !defined(__WXWINCE__) && \
-    (!defined(_MSC_VER) || (_MSC_VER > 1100))
+    !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
+    (!defined(_MSC_VER) || (_MSC_VER > 1100)) 
     #include <shlwapi.h>
 #endif
 
@@ -847,7 +847,8 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 /* static */
 int wxApp::GetComCtl32Version()
 {
-#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
+//FIX ME FOR DIGITALMARS!!
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__) || defined(__DIGITALMARS__)
     return 0;
 #else
     // cache the result
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 5eecfbe1aa..4c3f8d0593 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -14,7 +14,7 @@ WXDIR = ..\..
 
 include ..\makesc.env
 
-DEBUG=1
+DEBUG=0
 
 LIBTARGET = $(LIBDIR)\wx$(SC_SUFFIX).lib
 
@@ -133,6 +133,7 @@ COMMONOBJS = $(COMMDIR)\accesscmn.obj \
 		$(COMMDIR)\imagtiff.obj \
 		$(COMMDIR)\imagxpm.obj \
 		$(COMMDIR)\intl.obj \
+		$(COMMDIR)\init.obj \
 		$(COMMDIR)\ipcbase.obj \
 		$(COMMDIR)\layout.obj \
 		$(COMMDIR)\lboxcmn.obj \
diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 9e3c54c9d2..263ff804ad 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -1009,7 +1009,8 @@ wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #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 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
-- 
2.45.2