Applied rowspan patch #15276 (dghart)

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

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

-#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


@@ -46,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:
     /*


@@ -63,13 +62,16 @@ 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;
 };


@@ -77,6 +79,10 @@ 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
+#elif defined(__WXOSX_COCOA__) && !defined(__WXUNIVERSAL__)
+    #include "wx/osx/datectrl.h"
+

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


@@ -98,8 +104,7 @@ public:
         }
 
     private:
         }
 
     private:

-        DECLARE_DYNAMIC_CLASS(wxDatePickerCtrl)
-        DECLARE_NO_COPY_CLASS(wxDatePickerCtrl)
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)

     };
 #endif
 
     };
 #endif