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
This commit is contained in:
@@ -68,6 +68,8 @@ public:
|
|||||||
|
|
||||||
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
||||||
#include "wx/msw/datectrl.h"
|
#include "wx/msw/datectrl.h"
|
||||||
|
|
||||||
|
#define wxHAS_NATIVE_DATEPICKCTRL
|
||||||
#else
|
#else
|
||||||
#include "wx/generic/datectrl.h"
|
#include "wx/generic/datectrl.h"
|
||||||
|
|
||||||
|
@@ -25,13 +25,11 @@
|
|||||||
|
|
||||||
#if wxUSE_DATEPICKCTRL
|
#if wxUSE_DATEPICKCTRL
|
||||||
|
|
||||||
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
|
#include "wx/datectrl.h"
|
||||||
#define HAS_NATIVE_VERSION
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// use this version if we're explicitly requested to do it or if it's the only
|
// use this version if we're explicitly requested to do it or if it's the only
|
||||||
// one we have
|
// one we have
|
||||||
#if wxUSE_DATEPICKCTRL_GENERIC || !defined(HAS_NATIVE_VERSION)
|
#if wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL)
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/bmpbuttn.h"
|
#include "wx/bmpbuttn.h"
|
||||||
@@ -43,13 +41,12 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// otherwise it's defined in the native version implementation
|
// otherwise it's defined in the native version implementation
|
||||||
#ifndef HAS_NATIVE_VERSION
|
#ifndef wxHAS_NATIVE_DATEPICKCTRL
|
||||||
#define _WX_DEFINE_DATE_EVENTS_
|
#define _WX_DEFINE_DATE_EVENTS_
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/dateevt.h"
|
#include "wx/dateevt.h"
|
||||||
|
|
||||||
#include "wx/datectrl.h"
|
|
||||||
#include "wx/calctrl.h"
|
#include "wx/calctrl.h"
|
||||||
#include "wx/popupwin.h"
|
#include "wx/popupwin.h"
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user