Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/datecontrols.cpp b/src/msw/datecontrols.cpp
index 0ea7e786a1a7cbb2a9b208e8296aa00bd7731b4d..10e69f55b04cab7f1f18526c82e584b8ce09be3a 100644 (file)
--- a/src/msw/datecontrols.cpp
+++ b/src/msw/datecontrols.cpp
@@ -68,12 +68,8 @@ bool wxMSWDateControls::CheckInitialization()
         icex.dwICC = ICC_DATE_CLASSES;
 
         // see comment in wxApp::GetComCtl32Version() explaining the
         icex.dwICC = ICC_DATE_CLASSES;
 
         // see comment in wxApp::GetComCtl32Version() explaining the

-        // use of wxDL_GET_LOADED
-        wxDynamicLibrary dllComCtl32(_T("comctl32.dll"),
-                                     wxDL_VERBATIM |
-                                     wxDL_QUIET |
-                                     wxDL_GET_LOADED);
-
+        // use of wxLoadedDLL
+        wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));

         if ( dllComCtl32.IsLoaded() )
         {
             wxLogNull noLog;
         if ( dllComCtl32.IsLoaded() )
         {
             wxLogNull noLog;


@@ -81,8 +77,6 @@ bool wxMSWDateControls::CheckInitialization()
             typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
             wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
 
             typedef BOOL (WINAPI *ICCEx_t)(INITCOMMONCONTROLSEX *);
             wxDYNLIB_FUNCTION( ICCEx_t, InitCommonControlsEx, dllComCtl32 );
 

-            dllComCtl32.Detach();
-

             if ( pfnInitCommonControlsEx )
             {
                 s_initResult = (*pfnInitCommonControlsEx)(&icex);
             if ( pfnInitCommonControlsEx )
             {
                 s_initResult = (*pfnInitCommonControlsEx)(&icex);