#include "wx/dynlib.h"
#include "wx/msw/private.h"
+#include "wx/msw/ole/oleutils.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#define wxUSE_OLE 0
#endif // broken compilers
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+#include <aygshell.h>
+#endif
+
#if wxUSE_OLE
#include <ole2.h>
#endif
#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))
// 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 )
+ 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
InitCommonControls();
#endif // __WIN95__
-#if wxUSE_OLE || wxUSE_DRAG_AND_DROP
-
-#if wxUSE_OLE
- // we need to initialize OLE library
-#ifdef __WXWINCE__
- if ( FAILED(::CoInitializeEx(NULL, COINIT_MULTITHREADED)) )
- wxLogError(_("Cannot initialize OLE"));
-#else
- if ( FAILED(::OleInitialize(NULL)) )
- wxLogError(_("Cannot initialize OLE"));
-#endif
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+ SHInitExtraControls();
#endif
-#endif // wxUSE_OLE
-
-#if wxUSE_CTL3D
- if (!Ctl3dRegister(wxhInstance))
- wxLogError(wxT("Cannot register CTL3D"));
-
- Ctl3dAutoSubclass(wxhInstance);
-#endif // wxUSE_CTL3D
+ wxOleInitialize();
RegisterWindowClasses();
wxCleanUpPenWin();
#endif
-#if wxUSE_OLE
-#ifdef __WXWINCE__
- ::CoUninitialize();
-#else
- ::OleUninitialize();
-#endif
-#endif
+ wxOleUninitialize();
// for an EXE the classes are unregistered when it terminates but DLL may
// be loaded several times (load/unload/load) into the same process in
// unregister the classes now
UnregisterWindowClasses();
-#if wxUSE_CTL3D
- Ctl3dUnregister(wxhInstance);
-#endif
-
delete wxWinHandleHash;
wxWinHandleHash = NULL;
// 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 )
dvi.dwMinorVersion;
}
}
-#endif
// if DllGetVersion() is unavailable either during compile or
// run-time, try to guess the version otherwise