From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Fri, 26 May 2006 23:58:39 +0000 (+0000)
Subject: Correct dll usage for wxDatePickerCtrl under WinCE.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e0f4664cca1805bd3e5446ea03dfde081bce755

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 29aa63282b..dee7a71b9f 100644
--- 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.
+- Fixed wxDatePickerCtrl usage.
 
 wxUniv:
 
diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index f08a67a8d4..2af227ee9d 100644
--- 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 )
     {
+#ifndef __WXWINCE__
         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;
 
-        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
     }