Better fix

[wxWidgets.git] / src / msw / datectrl.cpp

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 438f34769407e1e9825ad3ce2445b6a60d058182..3a694a227e187dbdd13d684b61bbb6110d3ed740 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -259,9 +259,12 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
     // we need to keep only the date part, times don't make sense for this
     // control (in particular, comparisons with other dates would fail)
     m_date = dt;
     // we need to keep only the date part, times don't make sense for this
     // control (in particular, comparisons with other dates would fail)
     m_date = dt;

-    m_date.ResetTime();
+    if ( m_date.IsValid() )
+        m_date.ResetTime();

 }
 
 }
 

+#include <iostream>
+

 wxDateTime wxDatePickerCtrl::GetValue() const
 {
 #ifdef __WXDEBUG__
 wxDateTime wxDatePickerCtrl::GetValue() const
 {
 #ifdef __WXDEBUG__


@@ -351,7 +354,7 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             {
                 m_date = dt;
                 wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
             {
                 m_date = dt;
                 wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);

-                if ( GetEventHandler()->ProcessEvent(event) )
+                if ( HandleWindowEvent(event) )

                 {
                     *result = 0;
                     return true;
                 {
                     *result = 0;
                     return true;