fix bugs when compiling with dmars

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index b092c66a516a718c9999729f5651cdae805a188b..14fc50144e2d86d84cd2f50fcf561dc7af8f122f 100644 (file)
--- 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)
 
 
 #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??)
 // ---------------------------------------------------------------------------

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index e553e035345d1c35d580e3ac16a9316db895ce74..7af9c7108abae72ebaaece105e147fcad5c13719 100644 (file)
--- 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 )) && \
 #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
 
     #include <shlwapi.h>
 #endif
 


@@ -847,7 +847,8 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 /* static */
 int wxApp::GetComCtl32Version()
 {
 /* 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
     return 0;
 #else
     // cache the result

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 5eecfbe1aafb51b666b275c579d1b92142ddcd48..4c3f8d0593d2e8bc1b92d4785961a07fdba4050d 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -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)\imagxpm.obj \
                $(COMMDIR)\intl.obj \
                $(COMMDIR)\imagtiff.obj \
                $(COMMDIR)\imagxpm.obj \
                $(COMMDIR)\intl.obj \

+               $(COMMDIR)\init.obj \

                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
                $(COMMDIR)\lboxcmn.obj \
                $(COMMDIR)\ipcbase.obj \
                $(COMMDIR)\layout.obj \
                $(COMMDIR)\lboxcmn.obj \

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 9e3c54c9d2b9470a34b44fd1df8ed1d4ca5a6ee0..263ff804adfcd5ae6700c8697287c21bb96d006f 100644 (file)
--- 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 ) \
 {
     // 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);
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);