support retina display

[wxWidgets.git] / include / wx / datectrl.h

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 7adfbf775e310a0a33afd0c46e3c681fada497bc..3bf46761c03e08179ada6a3cfada869312c8bd89 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -16,17 +16,9 @@
 
 #if wxUSE_DATEPICKCTRL
 
 
 #if wxUSE_DATEPICKCTRL
 

-// this is currently defined in wx/msw/setup.h but not for MSW configure builds
-// and other ports which only have the generic version anyhow, so provide a
-// fallback definition here for them
-#ifndef wxUSE_DATEPICKCTRL_GENERIC
-    #define wxUSE_DATEPICKCTRL_GENERIC 0
-#endif
-
-#include "wx/control.h"         // the base class
-#include "wx/datetime.h"
+#include "wx/datetimectrl.h"    // the base class

 
 

-#define wxDatePickerCtrlNameStr _T("datectrl")
+#define wxDatePickerCtrlNameStr wxT("datectrl")

 
 // wxDatePickerCtrl styles
 enum
 
 // wxDatePickerCtrl styles
 enum


@@ -53,7 +45,7 @@ enum
 // wxDatePickerCtrl: allow the user to enter the date
 // ----------------------------------------------------------------------------
 
 // wxDatePickerCtrl: allow the user to enter the date
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxControl
+class WXDLLIMPEXP_ADV wxDatePickerCtrlBase : public wxDateTimePickerCtrl

 {
 public:
     /*
 {
 public:
     /*


@@ -70,23 +62,26 @@ public:
                     const wxString& name = wxDatePickerCtrlNameStr);
      */
 
                     const wxString& name = wxDatePickerCtrlNameStr);
      */
 

-    // set/get the date
-    virtual void SetValue(const wxDateTime& dt) = 0;
-    virtual wxDateTime GetValue() const = 0;
+    /*
+        We inherit the methods to set/get the date from the base class.
+
+        virtual void SetValue(const wxDateTime& dt) = 0;
+        virtual wxDateTime GetValue() const = 0;
+    */

 
 

-    // set/get the allowed valid range for the dates, if either/both of them
-    // are invalid, there is no corresponding limit and if neither is set
-    // GetRange() returns false
+    // And add methods to set/get the allowed valid range for the dates. If
+    // either/both of them are invalid, there is no corresponding limit and if
+    // neither is set, GetRange() returns false.

     virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0;
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 
     virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0;
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 

-#if defined(__WXPALMOS__)
-    #include "wx/palmos/datectrl.h"
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/datectrl.h"

 
     #define wxHAS_NATIVE_DATEPICKCTRL
 
     #define wxHAS_NATIVE_DATEPICKCTRL

-#elif defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    #include "wx/msw/datectrl.h"
+#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__)
+    #include "wx/osx/datectrl.h"

 
     #define wxHAS_NATIVE_DATEPICKCTRL
 #else
 
     #define wxHAS_NATIVE_DATEPICKCTRL
 #else