diff --git a/include/wx/msw/private/datecontrols.h b/include/wx/msw/private/datecontrols.h index 9794cfae89..b38723a40a 100644 --- a/include/wx/msw/private/datecontrols.h +++ b/include/wx/msw/private/datecontrols.h @@ -14,6 +14,7 @@ #include "wx/msw/wrapwin.h" +#if wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL // namespace for the helper functions related to the date controls namespace wxMSWDateControls { @@ -24,6 +25,7 @@ namespace wxMSWDateControls extern bool CheckInitialization(); } // namespace wxMSWDateControls +#endif // wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL #endif // _MSW_PRIVATE_DATECONTROLS_H_ diff --git a/src/msw/datetimectrl.cpp b/src/msw/datetimectrl.cpp index 18eed3d105..cbc65b42a2 100644 --- a/src/msw/datetimectrl.cpp +++ b/src/msw/datetimectrl.cpp @@ -62,8 +62,10 @@ wxDateTimePickerCtrl::MSWCreateDateTimePicker(wxWindow *parent, const wxValidator& validator, const wxString& name) { +#if wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL if ( !wxMSWDateControls::CheckInitialization() ) return false; +#endif // wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL // initialize the base class if ( !CreateControl(parent, id, pos, size, style, validator, name) )