#if wxUSE_DATAOBJ guard src/gtk/dataobj.cpp

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 2c0de2d84579540d6b6e8f57d23ef6d464b84449..419870ccdf737ec0d521e6f4eec03819b23bee59 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -69,7 +69,8 @@
 #endif // broken compilers
 
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-#include <aygshell.h>
+    #include <ole2.h>
+    #include <aygshell.h>
 #endif
 
 #if wxUSE_OLE
@@ -280,27 +281,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     }
 #endif
 
-    // the first thing to do is to check if we're trying to run an Unicode
-    // program under Win9x w/o MSLU emulation layer - if so, abort right now
-    // as it has no chance to work
-#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
-    if ( wxGetOsVersion() != wxWINDOWS_NT && wxGetOsVersion() != wxWINDOWS_CE && wxGetOsVersion() != wxWINDOWS_SMARTPHONE && wxGetOsVersion() != wxWINDOWS_POCKETPC )
-    {
-        // note that we can use MessageBoxW() as it's implemented even under
-        // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs
-        // used by wxLocale are not
-        ::MessageBox
-        (
-         NULL,
-         _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
-         _T("wxWidgets Fatal Error"),
-         MB_ICONERROR | MB_OK
-        );
-
-        return false;
-    }
-#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
-
 #if defined(__WIN95__) && !defined(__WXMICROWIN__)
     InitCommonControls();
 #endif // __WIN95__
@@ -612,18 +592,21 @@ int wxApp::GetComCtl32Version()
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {
+            // check is struct used by DllGetVersion() is available in the
+            // headers and define it ourselves if it isn't
 #ifndef DLLVER_PLATFORM_WINDOWS
-                       typedef struct _DllVersionInfo
+                       struct DLLVERSIONINFO
                        {
                                DWORD cbSize;
                                DWORD dwMajorVersion;                   // Major version
                                DWORD dwMinorVersion;                   // Minor version
                                DWORD dwBuildNumber;                    // Build number
                                DWORD dwPlatformID;                     // DLLVER_PLATFORM_*
-                       } DLLVERSIONINFO;
+                       };
                        typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
-#endif
-            // try to use DllGetVersion() if available in _headers_
+#endif // defined(DLLVERSIONINFO)
+
+            // now check if it's available during run-time
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )
             {