From a34bedd7b54933ebd279f28d2a7908647aec89fe Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 29 Oct 2018 23:12:57 +0100 Subject: [PATCH] Revert "Add guard over wxMSWDateControls" This reverts commit f1fa6d5ea25bed5870c7933176f2332205009f12 which doesn't seem correct nor necessary. --- include/wx/msw/private/datecontrols.h | 2 -- src/msw/datetimectrl.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/wx/msw/private/datecontrols.h b/include/wx/msw/private/datecontrols.h index b38723a40a..9794cfae89 100644 --- a/include/wx/msw/private/datecontrols.h +++ b/include/wx/msw/private/datecontrols.h @@ -14,7 +14,6 @@ #include "wx/msw/wrapwin.h" -#if wxUSE_DATEPICKCTRL || wxUSE_CALENDARCTRL // namespace for the helper functions related to the date controls namespace wxMSWDateControls { @@ -25,7 +24,6 @@ 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 cbc65b42a2..18eed3d105 100644 --- a/src/msw/datetimectrl.cpp +++ b/src/msw/datetimectrl.cpp @@ -62,10 +62,8 @@ 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) )