Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 64ea13114310a536679e450663793536e052a346..529d6688c06d53e604c2718793ed0223cb449f66 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -68,6 +68,10 @@
     #define  wxUSE_OLE 0
 #endif // broken compilers
 
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+#include <aygshell.h>
+#endif
+
 #if wxUSE_OLE
     #include <ole2.h>
 #endif
@@ -82,6 +86,7 @@
 #include "wx/msw/wince/missing.h"
 #endif
 
+// For DLLVER_PLATFORM_WINDOWS
 #if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
     !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
     (!defined(_MSC_VER) || (_MSC_VER > 1100))
@@ -275,31 +280,14 @@ 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__
 
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    SHInitExtraControls();
+#endif
+
     wxOleInitialize();
 
     RegisterWindowClasses();
@@ -603,7 +591,17 @@ int wxApp::GetComCtl32Version()
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {
-#ifdef DLLVER_PLATFORM_WINDOWS
+#ifndef DLLVER_PLATFORM_WINDOWS
+                       typedef 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_
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )
@@ -625,7 +623,6 @@ int wxApp::GetComCtl32Version()
                                         dvi.dwMinorVersion;
                 }
             }
-#endif
 
             // if DllGetVersion() is unavailable either during compile or
             // run-time, try to guess the version otherwise