Fix search for item by text in wxMSW wxListCtrl.

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

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 1009211b4d9dc777eca784dc1838d88b11011dbc..31952163c809d16b5d8ffd4220e2aaa6a0db6f22 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -148,7 +148,7 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
         const DWORD rc = ::GetLastError();
         if ( rc != ERROR_INSUFFICIENT_BUFFER )
         {
-            wxLogApiError(_T("GetDateFormat"), rc);
+            wxLogApiError(wxT("GetDateFormat"), rc);
 
             // fall back on wxDateTime, what else to do?
             s = wxDateTime::Today().FormatDate();
@@ -160,7 +160,7 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
     // representation of todays date because the control must accommodate any
     // date and while the widths of all digits are usually about the same, the
     // width of the month string varies a lot, so try to account for it
-    s += _T("WW");
+    s += wxT("WW");
 
     int x, y;
     dc.GetTextExtent(s, &x, &y);
@@ -184,7 +184,7 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
 void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
 {
     wxCHECK_RET( dt.IsValid() || HasFlag(wxDP_ALLOWNONE),
-                    _T("this control requires a valid date") );
+                    wxT("this control requires a valid date") );
 
     SYSTEMTIME st;
     if ( dt.IsValid() )
@@ -193,7 +193,7 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
                                  dt.IsValid() ? GDT_VALID : GDT_NONE,
                                  &st) )
     {
-        wxLogDebug(_T("DateTime_SetSystemtime() failed"));
+        wxLogDebug(wxT("DateTime_SetSystemtime() failed"));
     }
 
     // we need to keep only the date part, times don't make sense for this
@@ -205,18 +205,18 @@ void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
 
 wxDateTime wxDatePickerCtrl::GetValue() const
 {
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
     wxDateTime dt;
     SYSTEMTIME st;
     if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID )
     {
-        dt.SetFromMSWSysTime(st);
+        dt.SetFromMSWSysDate(st);
     }
 
     wxASSERT_MSG( m_date.IsValid() == dt.IsValid() &&
                     (!dt.IsValid() || dt == m_date),
-                  _T("bug in wxDatePickerCtrl: m_date not in sync") );
-#endif // __WXDEBUG__
+                  wxT("bug in wxDatePickerCtrl: m_date not in sync") );
+#endif // wxDEBUG_LEVEL
 
     return m_date;
 }
@@ -240,7 +240,7 @@ void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2)
 
     if ( !DateTime_SetRange(GetHwnd(), flags, st) )
     {
-        wxLogDebug(_T("DateTime_SetRange() failed"));
+        wxLogDebug(wxT("DateTime_SetRange() failed"));
     }
 }
 
@@ -252,7 +252,7 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt1 )
     {
         if ( flags & GDTR_MIN )
-            dt1->SetFromMSWSysTime(st[0]);
+            dt1->SetFromMSWSysDate(st[0]);
         else
             *dt1 = wxDefaultDateTime;
     }
@@ -260,7 +260,7 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
     if ( dt2 )
     {
         if ( flags & GDTR_MAX )
-            dt2->SetFromMSWSysTime(st[1]);
+            dt2->SetFromMSWSysDate(st[1]);
         else
             *dt2 = wxDefaultDateTime;
     }
@@ -283,7 +283,7 @@ wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
             wxDateTime dt;
             if ( dtch->dwFlags == GDT_VALID )
-                dt.SetFromMSWSysTime(dtch->st);
+                dt.SetFromMSWSysDate(dtch->st);
 
             // filter out duplicate DTN_DATETIMECHANGE events which the native
             // control sends us when using wxDP_DROPDOWN style