Use unsigned char for XBM bitmaps data.

[wxWidgets.git] / src / msw / datecontrols.cpp

diff --git a/src/msw/datecontrols.cpp b/src/msw/datecontrols.cpp
index e8503510776cc5c8a53055afefcd4e56e6237276..10e69f55b04cab7f1f18526c82e584b8ce09be3a 100644 (file)
--- a/src/msw/datecontrols.cpp
+++ b/src/msw/datecontrols.cpp
@@ -24,6 +24,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"
+    #include "wx/msw/wrapcctl.h"

 #endif // WX_PRECOMP
 
 #if wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL
 #endif // WX_PRECOMP
 
 #if wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL


@@ -65,10 +67,13 @@ bool wxMSWDateControls::CheckInitialization()
         icex.dwSize = sizeof(icex);
         icex.dwICC = ICC_DATE_CLASSES;
 
         icex.dwSize = sizeof(icex);
         icex.dwICC = ICC_DATE_CLASSES;
 

-        wxDynamicLibrary dllComCtl32(_T("comctl32.dll") , wxDL_VERBATIM);
-
+        // see comment in wxApp::GetComCtl32Version() explaining the
+        // use of wxLoadedDLL
+        wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));

         if ( dllComCtl32.IsLoaded() )
         {
         if ( dllComCtl32.IsLoaded() )
         {

+            wxLogNull noLog;
+

             typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
             wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
 
             typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
             wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );