fixes for wxDP_ALLOWNONE case

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

diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 59fff7cfeb5f5d582453c3d746fee0c758f0b5aa..fb34cfe2803413c1c7d818d414bad909291b493a 100644 (file)
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -599,9 +599,10 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
 
     wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
     sizerText->Add(new wxStaticText(this, -1, _T("Date in ISO format: ")),
 
     wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
     sizerText->Add(new wxStaticText(this, -1, _T("Date in ISO format: ")),

-                    wxSizerFlags().Border());
+                    wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));

     m_text = new wxTextCtrl(this, -1);
     m_text = new wxTextCtrl(this, -1);

-    sizerText->Add(m_text, wxSizerFlags().Expand().Border());
+    sizerText->Add(m_text, wxSizerFlags().
+                        Expand().Border().Align(wxALIGN_CENTRE_VERTICAL));

 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(new wxStaticText
 
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
     sizerTop->Add(new wxStaticText


@@ -638,7 +639,8 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
 
 void MyDialog::OnDateChange(wxDateEvent& event)
 {
 
 void MyDialog::OnDateChange(wxDateEvent& event)
 {

-    m_text->SetValue(event.GetDate().FormatISODate());
+    const wxDateTime dt = event.GetDate();
+    m_text->SetValue(dt.IsValid()? dt.FormatISODate() : wxString());

 }
 
 #endif // wxUSE_DATEPICKCTRL
 }
 
 #endif // wxUSE_DATEPICKCTRL