Correct dll usage for wxDatePickerCtrl under WinCE.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 29aa63282b786b5d13a30392fb6e0d66b20b8f91..dee7a71b9fe3a7e38de974b5b4436a6eaa2c5447 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -276,6 +276,7 @@ wxWinCE:
   and added platform-specific wxWindow::EnableContextMenu.
 - Fixed wxGenericFileDialog to work with WinCE.
 - Fixed compilation and menubar disappearance on Windows Mobile 5.
   and added platform-specific wxWindow::EnableContextMenu.
 - Fixed wxGenericFileDialog to work with WinCE.
 - Fixed compilation and menubar disappearance on Windows Mobile 5.

+- Fixed wxDatePickerCtrl usage.

 
 wxUniv:
 
 
 wxUniv:
 

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index f08a67a8d44a1c383652dda943d7c330c9cb0ac9..2af227ee9d5a0055db24eb6ecc82603d42186224 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -104,29 +104,40 @@ wxDatePickerCtrl::Create(wxWindow *parent,
     static bool s_initDone = false; // MT-ok: used from GUI thread only
     if ( !s_initDone )
     {
     static bool s_initDone = false; // MT-ok: used from GUI thread only
     if ( !s_initDone )
     {

+#ifndef __WXWINCE__

         if ( wxApp::GetComCtl32Version() < 470 )
         {
             wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
 
             return false;
         }
         if ( wxApp::GetComCtl32Version() < 470 )
         {
             wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
 
             return false;
         }

+#endif

 
 #if wxUSE_DYNLIB_CLASS
         INITCOMMONCONTROLSEX icex;
         icex.dwSize = sizeof(icex);
         icex.dwICC = ICC_DATE_CLASSES;
 
 
 #if wxUSE_DYNLIB_CLASS
         INITCOMMONCONTROLSEX icex;
         icex.dwSize = sizeof(icex);
         icex.dwICC = ICC_DATE_CLASSES;
 

-        wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
-
-        typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
-        wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
+        wxDynamicLibrary dllComCtl32(
+#ifdef __WXWINCE__
+            _T("commctrl.dll")
+#else
+            _T("comctl32.dll")
+#endif
+            , wxDL_VERBATIM);

 
 

-        if ( pfnInitCommonControlsEx )
+        if ( dllComCtl32.IsLoaded() )

         {
         {

-            (*pfnInitCommonControlsEx)(&icex);
-        }
+            typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
+            wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );

 
 

-        s_initDone = true;
+            if ( pfnInitCommonControlsEx )
+            {
+                (*pfnInitCommonControlsEx)(&icex);
+            }
+
+            s_initDone = true;
+        }

 #endif
     }
 
 #endif
     }