Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct dll usage for wxDatePickerCtrl under WinCE.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/datectrl.cpp
View File

@@ -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);
wxDynamicLibrary dllComCtl32(
#ifdef __WXWINCE__
_T("commctrl.dll")
#else
_T("comctl32.dll")
#endif
, wxDL_VERBATIM);
typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
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
}