From: Vadim Zeitlin Date: Fri, 21 Jan 2005 14:41:38 +0000 (+0000) Subject: define wxHAS_NATIVE_DATEPICKCTRL in the header file to make it available to user... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/15c86b39a7fef5a4689f8f767bbeabcad5cceee2 define wxHAS_NATIVE_DATEPICKCTRL in the header file to make it available to user code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h index 834ec21a01..d221993aa0 100644 --- a/include/wx/datectrl.h +++ b/include/wx/datectrl.h @@ -68,6 +68,8 @@ public: #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/datectrl.h" + + #define wxHAS_NATIVE_DATEPICKCTRL #else #include "wx/generic/datectrl.h" diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp index 42d4c09a3e..27331850dd 100644 --- a/src/generic/datectlg.cpp +++ b/src/generic/datectlg.cpp @@ -25,13 +25,11 @@ #if wxUSE_DATEPICKCTRL -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) - #define HAS_NATIVE_VERSION -#endif +#include "wx/datectrl.h" // use this version if we're explicitly requested to do it or if it's the only // one we have -#if wxUSE_DATEPICKCTRL_GENERIC || !defined(HAS_NATIVE_VERSION) +#if wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL) #ifndef WX_PRECOMP #include "wx/bmpbuttn.h" @@ -43,13 +41,12 @@ #endif // otherwise it's defined in the native version implementation -#ifndef HAS_NATIVE_VERSION +#ifndef wxHAS_NATIVE_DATEPICKCTRL #define _WX_DEFINE_DATE_EVENTS_ #endif #include "wx/dateevt.h" -#include "wx/datectrl.h" #include "wx/calctrl.h" #include "wx/popupwin.h"