define wxHAS_NATIVE_DATEPICKCTRL in the header file to make it available to user...

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 834ec21a01a7b203cded4780106c261bf04c8466..d221993aa05affc9f149021dcfb9832347da4057 100644 (file)
--- 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"
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/datectrl.h"

+
+    #define wxHAS_NATIVE_DATEPICKCTRL

 #else
     #include "wx/generic/datectrl.h"
 
 #else
     #include "wx/generic/datectrl.h"
 

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 42d4c09a3e13e85a7e9b35a7fd7728eecb069747..27331850dd09c83bd3637de2c2a79484917a6eb8 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -25,13 +25,11 @@
 
 #if wxUSE_DATEPICKCTRL
 
 
 #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
 
 // 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"
 
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"


@@ -43,13 +41,12 @@
 #endif
 
 // otherwise it's defined in the native version implementation
 #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"
 
     #define _WX_DEFINE_DATE_EVENTS_
 #endif
 
 #include "wx/dateevt.h"
 

-#include "wx/datectrl.h"

 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"