Forward-ported wxPython-bindings related cleanup from 2.9.0 branch

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

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 0b291ecdd41b8a4bda6fe9f3fdf4939fd1925f8a..176d095f7cce5c43c3aeeeffb1ca194fb00fe448 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -124,7 +124,7 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxDatePickerCtrl::DoGetBestSize() const
 {
-    wxClientDC dc(wx_const_cast(wxDatePickerCtrl *, this));
+    wxClientDC dc(const_cast<wxDatePickerCtrl *>(this));
 
     // we can't use FormatDate() here as the CRT doesn't always use the same
     // format as the date picker control
@@ -205,7 +205,7 @@ 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 )
@@ -216,7 +216,7 @@ wxDateTime wxDatePickerCtrl::GetValue() const
     wxASSERT_MSG( m_date.IsValid() == dt.IsValid() &&
                     (!dt.IsValid() || dt == m_date),
                   _T("bug in wxDatePickerCtrl: m_date not in sync") );
-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL
 
     return m_date;
 }