xti additions / changes, trying to reduce dependencies

[wxWidgets.git] / src / msw / app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index e553e035345d1c35d580e3ac16a9316db895ce74..ec3c4c0124c042290e1c7da37633fb0a59e4f043 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


@@ -870,6 +871,7 @@ int wxApp::GetComCtl32Version()
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {

+#ifdef DLLVER_PLATFORM_WINDOWS

             // try to use DllGetVersion() if available in _headers_
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )
             // try to use DllGetVersion() if available in _headers_
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )


@@ -891,6 +893,7 @@ int wxApp::GetComCtl32Version()
                                         dvi.dwMinorVersion;
                 }
             }
                                         dvi.dwMinorVersion;
                 }
             }

+#endif

 
             // if DllGetVersion() is unavailable either during compile or
             // run-time, try to guess the version otherwise
 
             // if DllGetVersion() is unavailable either during compile or
             // run-time, try to guess the version otherwise