diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:19:14 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:19:14 +0200 |
| commit | 01eb8253196672c969a39587e90b49321a182428 (patch) | |
| tree | 4a3b71d7913de519744466c9227fda6461c4f0b5 /wx+/timespan.h | |
| parent | 5.0 (diff) | |
| download | FreeFileSync-01eb8253196672c969a39587e90b49321a182428.tar.gz FreeFileSync-01eb8253196672c969a39587e90b49321a182428.tar.bz2 FreeFileSync-01eb8253196672c969a39587e90b49321a182428.zip | |
5.1
Diffstat (limited to 'wx+/timespan.h')
| -rw-r--r-- | wx+/timespan.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wx+/timespan.h b/wx+/timespan.h index 241a029e..58d5df4e 100644 --- a/wx+/timespan.h +++ b/wx+/timespan.h @@ -52,10 +52,10 @@ public: Layout(); //connect events - m_spinBtn ->Connect(wxEVT_SCROLL_LINEUP, wxEventHandler (TimeSpanCtrl::OnSpinUp), NULL, this); - m_spinBtn ->Connect(wxEVT_SCROLL_LINEDOWN, wxEventHandler (TimeSpanCtrl::OnSpinDown), NULL, this); - m_textCtrl->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler (TimeSpanCtrl::OnKeyPress), NULL, this); - m_textCtrl->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(TimeSpanCtrl::OnMouseAction), NULL, this); + m_spinBtn ->Connect(wxEVT_SCROLL_LINEUP, wxEventHandler (TimeSpanCtrl::OnSpinUp), nullptr, this); + m_spinBtn ->Connect(wxEVT_SCROLL_LINEDOWN, wxEventHandler (TimeSpanCtrl::OnSpinDown), nullptr, this); + m_textCtrl->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler (TimeSpanCtrl::OnKeyPress), nullptr, this); + m_textCtrl->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(TimeSpanCtrl::OnMouseAction), nullptr, this); setValue(0); } @@ -94,7 +94,7 @@ public: textVal.Trim(false); wxDateTime tmp(time_t(0)); - if (tmp.ParseFormat(textVal, FORMAT_TIMESPAN, wxDateTime(tmp)) == NULL) + if (tmp.ParseFormat(textVal, FORMAT_TIMESPAN, wxDateTime(tmp)) == nullptr) return 0; return (isNegative ? -1 : 1) * |