Use wxGetTranslation() instead of _() in the public headers.

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

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 834ec21a01a7b203cded4780106c261bf04c8466..6fa4367c0a2abc0e22b8811384bbfcfdbc5e7415 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-09

-// RCS-ID:      $Id$

 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -12,10 +11,13 @@
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 

-#include "wx/control.h"         // the base class
-#include "wx/datetime.h"
+#include "wx/defs.h"

 
 

-#define wxDatePickerCtrlNameStr _T("datectrl")
+#if wxUSE_DATEPICKCTRL
+
+#include "wx/datetimectrl.h"    // the base class
+
+#define wxDatePickerCtrlNameStr wxT("datectrl")

 
 // wxDatePickerCtrl styles
 enum
 
 // wxDatePickerCtrl styles
 enum


@@ -31,14 +33,18 @@ enum
 
     // always show century in the default date display (otherwise it depends on
     // the system date format which may include the century or not)
 
     // always show century in the default date display (otherwise it depends on
     // the system date format which may include the century or not)

-    wxDP_SHOWCENTURY = 4
+    wxDP_SHOWCENTURY = 4,
+
+    // allow not having any valid date in the control (by default it always has
+    // some date, today initially if no valid date specified in ctor)
+    wxDP_ALLOWNONE = 8

 };
 
 // ----------------------------------------------------------------------------
 // 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:
     /*


@@ -55,19 +61,28 @@ 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;
 };
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/datectrl.h"
     virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0;
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 
 #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"
 
 #else
     #include "wx/generic/datectrl.h"
 


@@ -81,16 +96,18 @@ public:
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,

+                         const wxValidator& validator = wxDefaultValidator,

                          const wxString& name = wxDatePickerCtrlNameStr)
                          const wxString& name = wxDatePickerCtrlNameStr)

-            : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, name)
+            : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, validator, name)

         {
         }
 
     private:
         {
         }
 
     private:

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

     };
 #endif
 
     };
 #endif
 

+#endif // wxUSE_DATEPICKCTRL
+

 #endif // _WX_DATECTRL_H_
 
 #endif // _WX_DATECTRL_H_