Added validator to generic date picker control

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 76a6ffb332006c2cbf3776a80af6be3ebbc227d0..d868bead78e65e5113bdd93d7377365995943315 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -87,8 +87,9 @@ 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)

         {
         }
 
         {
         }
 

diff --git a/include/wx/generic/datectrl.h b/include/wx/generic/datectrl.h
index 701fce4ca79e2b43ca3f06dd15ca69005e38423d..eb761b9bd1b1658dc031e409e24c6ff252b0ac46 100644 (file)
--- a/include/wx/generic/datectrl.h
+++ b/include/wx/generic/datectrl.h
@@ -30,11 +30,12 @@ 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)
     {
         Init();
 
                             const wxString& name = wxDatePickerCtrlNameStr)
     {
         Init();
 

-        (void)Create(parent, id, date, pos, size, style, name);
+        (void)Create(parent, id, date, pos, size, style, validator, name);

     }
 
     bool Create(wxWindow *parent,
     }
 
     bool Create(wxWindow *parent,


@@ -43,6 +44,7 @@ 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);
 
     // wxDatePickerCtrl methods
                 const wxString& name = wxDatePickerCtrlNameStr);
 
     // wxDatePickerCtrl methods

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 19c8a65e1a93f92691361b15cf647da6b7080bc4..4b9fdfeeb1a250de8c0adb455867d5b4a686f230 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -92,6 +92,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
                                      const wxPoint& pos,
                                      const wxSize& size,
                                      long style,
                                      const wxPoint& pos,
                                      const wxSize& size,
                                      long style,

+                                     const wxValidator& validator,

                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),
                                      const wxString& name)
 {
     wxASSERT_MSG( !(style & wxDP_SPIN),


@@ -99,7 +100,7 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,

-                            wxDefaultValidator, name) )
+                            validator, name) )

 
     {
         return false;
 
     {
         return false;