Correct dll usage for wxDatePickerCtrl under WinCE.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-26 23:58:39 +00:00
parent 4a2e5ee8f9
commit 6e0f4664cc
2 changed files with 20 additions and 8 deletions

View File

@@ -276,6 +276,7 @@ wxWinCE:
and added platform-specific wxWindow::EnableContextMenu. and added platform-specific wxWindow::EnableContextMenu.
- Fixed wxGenericFileDialog to work with WinCE. - Fixed wxGenericFileDialog to work with WinCE.
- Fixed compilation and menubar disappearance on Windows Mobile 5. - Fixed compilation and menubar disappearance on Windows Mobile 5.
- Fixed wxDatePickerCtrl usage.
wxUniv: wxUniv:

View File

@@ -104,20 +104,30 @@ wxDatePickerCtrl::Create(wxWindow *parent,
static bool s_initDone = false; // MT-ok: used from GUI thread only static bool s_initDone = false; // MT-ok: used from GUI thread only
if ( !s_initDone ) if ( !s_initDone )
{ {
#ifndef __WXWINCE__
if ( wxApp::GetComCtl32Version() < 470 ) if ( wxApp::GetComCtl32Version() < 470 )
{ {
wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll")); wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll"));
return false; return false;
} }
#endif
#if wxUSE_DYNLIB_CLASS #if wxUSE_DYNLIB_CLASS
INITCOMMONCONTROLSEX icex; INITCOMMONCONTROLSEX icex;
icex.dwSize = sizeof(icex); icex.dwSize = sizeof(icex);
icex.dwICC = ICC_DATE_CLASSES; icex.dwICC = ICC_DATE_CLASSES;
wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM); wxDynamicLibrary dllComCtl32(
#ifdef __WXWINCE__
_T("commctrl.dll")
#else
_T("comctl32.dll")
#endif
, wxDL_VERBATIM);
if ( dllComCtl32.IsLoaded() )
{
typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *); typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 ); wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
@@ -127,6 +137,7 @@ wxDatePickerCtrl::Create(wxWindow *parent,
} }
s_initDone = true; s_initDone = true;
}
#endif #endif
} }