Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor editing.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-14 18:28:56 +00:00
parent b444ce1161
commit a7c58211db
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
samples/calendar/calendar.cpp
View File

@@ -96,7 +96,7 @@ public:
void SetDate(); void SetDate();
void Today(); void Today();
private: private:
wxCalendarCtrl *m_calendar; wxCalendarCtrl *m_calendar;
wxStaticText *m_date; wxStaticText *m_date;
@@ -590,7 +590,7 @@ void MyPanel::Today()
#if wxUSE_DATEPICKCTRL #if wxUSE_DATEPICKCTRL
MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle) MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
: wxDialog(parent, -1, wxString(_T("Calendar: Choose a date"))) : wxDialog(parent, wxID_ANY, wxString(_T("Calendar: Choose a date")))
{ {
wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer; wxStdDialogButtonSizer *sizerBtns = new wxStdDialogButtonSizer;
sizerBtns->AddButton(new wxButton(this, wxID_OK)); sizerBtns->AddButton(new wxButton(this, wxID_OK));
@@ -598,16 +598,16 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
sizerBtns->Finalise(); sizerBtns->Finalise();
wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizerText = new wxBoxSizer(wxHORIZONTAL);
sizerText->Add(new wxStaticText(this, -1, _T("Date in ISO format: ")), sizerText->Add(new wxStaticText(this, wxID_ANY, _T("Date in ISO format: ")),
wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL)); wxSizerFlags().Border().Align(wxALIGN_CENTRE_VERTICAL));
m_text = new wxTextCtrl(this, -1); m_text = new wxTextCtrl(this, wxID_ANY);
sizerText->Add(m_text, wxSizerFlags(). sizerText->Add(m_text, wxSizerFlags().
Expand().Border().Align(wxALIGN_CENTRE_VERTICAL)); Expand().Border().Align(wxALIGN_CENTRE_VERTICAL));
wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
sizerTop->Add(new wxStaticText sizerTop->Add(new wxStaticText
( (
this, -1, this, wxID_ANY,
_T("Enter your birthday date (not before 20th century):") _T("Enter your birthday date (not before 20th century):")
), ),
wxSizerFlags().Border()); wxSizerFlags().Border());
@@ -615,13 +615,13 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
#if wxUSE_DATEPICKCTRL_GENERIC #if wxUSE_DATEPICKCTRL_GENERIC
wxFrame *frame = (wxFrame *)wxGetTopLevelParent(parent); wxFrame *frame = (wxFrame *)wxGetTopLevelParent(parent);
if ( frame && frame->GetMenuBar()->IsChecked(Calendar_DatePicker_Generic) ) if ( frame && frame->GetMenuBar()->IsChecked(Calendar_DatePicker_Generic) )
m_datePicker = new wxDatePickerCtrlGeneric(this, -1, dt, m_datePicker = new wxDatePickerCtrlGeneric(this, wxID_ANY, dt,
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, wxDefaultSize,
dtpStyle); dtpStyle);
else else
#endif // wxUSE_DATEPICKCTRL_GENERIC #endif // wxUSE_DATEPICKCTRL_GENERIC
m_datePicker = new wxDatePickerCtrl(this, -1, dt, m_datePicker = new wxDatePickerCtrl(this, wxID_ANY, dt,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
dtpStyle); dtpStyle);
m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900), m_datePicker->SetRange(wxDateTime(1, wxDateTime::Jan, 1900),
@@ -640,7 +640,10 @@ MyDialog::MyDialog(wxWindow *parent, const wxDateTime& dt, int dtpStyle)
void MyDialog::OnDateChange(wxDateEvent& event) void MyDialog::OnDateChange(wxDateEvent& event)
{ {
const wxDateTime dt = event.GetDate(); const wxDateTime dt = event.GetDate();
m_text->SetValue(dt.IsValid()? dt.FormatISODate() : wxString()); if(dt.IsValid())
m_text->SetValue(dt.FormatISODate());
else
m_text->SetValue(wxEmptyString);
} }
#endif // wxUSE_DATEPICKCTRL #endif // wxUSE_DATEPICKCTRL

11
src/generic/datectlg.cpp
View File

@@ -506,7 +506,7 @@ void wxDatePickerCtrlGeneric::DropDown(bool down)
if (down) if (down)
{ {
wxDateTime dt; wxDateTime dt;
if (!m_txt->GetValue().IsEmpty()) if (!m_txt->GetValue().empty())
dt.ParseFormat(m_txt->GetValue(), m_format); dt.ParseFormat(m_txt->GetValue(), m_format);
if (dt.IsValid()) if (dt.IsValid())
@@ -588,7 +588,10 @@ void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
dt = m_currentDate; dt = m_currentDate;
} }
m_txt->SetValue(dt.IsValid()? dt.Format(m_format) : wxString()); if(dt.IsValid())
m_txt->SetValue(dt.Format(m_format));
else
m_txt->SetValue(wxEmptyString);
// notify that we had to change the date after validation // notify that we had to change the date after validation
if ( (dt.IsValid() && m_currentDate != dt) || if ( (dt.IsValid() && m_currentDate != dt) ||
@@ -630,9 +633,9 @@ void wxDatePickerCtrlGeneric::OnText(wxCommandEvent &ev)
// We'll create an additional event if the date is valid. // We'll create an additional event if the date is valid.
// If the date isn't valid, the user's probably in the middle of typing // If the date isn't valid, the user's probably in the middle of typing
wxString txt=m_txt->GetValue(); wxString txt = m_txt->GetValue();
wxDateTime dt; wxDateTime dt;
if (!txt.IsEmpty()) if (!txt.empty())
{ {
dt.ParseFormat(txt, m_format); dt.ParseFormat(txt, m_format);
if (!dt.IsValid()) if (!dt.IsValid())