projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gtk wxStaticText and wxALIGN_CENTER_VERTICAL
[wxWidgets.git]
/
src
/
msw
/
datectrl.cpp
diff --git
a/src/msw/datectrl.cpp
b/src/msw/datectrl.cpp
index 0beaeb4e8d71500711d126a11a1477e1341c339a..692f0462d4828f1084495232dbc851c45ff616b1 100644
(file)
--- a/
src/msw/datectrl.cpp
+++ b/
src/msw/datectrl.cpp
@@
-38,7
+38,6
@@
#include "wx/msw/private/datecontrols.h"
#include "wx/msw/private/datecontrols.h"
-#define _WX_DEFINE_DATE_EVENTS_
#include "wx/dateevt.h"
// apparently some versions of mingw define these macros erroneously
#include "wx/dateevt.h"
// apparently some versions of mingw define these macros erroneously
@@
-179,7
+178,7
@@
void wxDatePickerCtrl::SetValue(const wxDateTime& dt)
SYSTEMTIME st;
if ( dt.IsValid() )
SYSTEMTIME st;
if ( dt.IsValid() )
-
wxMSWDateControls::ToSystemTime(&st, d
t);
+
dt.GetAsMSWSysTime(&s
t);
if ( !DateTime_SetSystemtime(GetHwnd(),
dt.IsValid() ? GDT_VALID : GDT_NONE,
&st) )
if ( !DateTime_SetSystemtime(GetHwnd(),
dt.IsValid() ? GDT_VALID : GDT_NONE,
&st) )
@@
-201,7
+200,7
@@
wxDateTime wxDatePickerCtrl::GetValue() const
SYSTEMTIME st;
if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID )
{
SYSTEMTIME st;
if ( DateTime_GetSystemtime(GetHwnd(), &st) == GDT_VALID )
{
-
wxMSWDateControls::FromSystemTime(&dt,
st);
+
dt.SetFromMSWSysTime(
st);
}
wxASSERT_MSG( m_date.IsValid() == dt.IsValid() &&
}
wxASSERT_MSG( m_date.IsValid() == dt.IsValid() &&
@@
-219,13
+218,13
@@
void wxDatePickerCtrl::SetRange(const wxDateTime& dt1, const wxDateTime& dt2)
DWORD flags = 0;
if ( dt1.IsValid() )
{
DWORD flags = 0;
if ( dt1.IsValid() )
{
-
wxMSWDateControls::ToSystemTime(&st[0], dt1
);
+
dt1.GetAsMSWSysTime(st + 0
);
flags |= GDTR_MIN;
}
if ( dt2.IsValid() )
{
flags |= GDTR_MIN;
}
if ( dt2.IsValid() )
{
-
wxMSWDateControls::ToSystemTime(&st[1], dt2
);
+
dt2.GetAsMSWSysTime(st + 1
);
flags |= GDTR_MAX;
}
flags |= GDTR_MAX;
}
@@
-243,7
+242,7
@@
bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
if ( dt1 )
{
if ( flags & GDTR_MIN )
if ( dt1 )
{
if ( flags & GDTR_MIN )
-
wxMSWDateControls::FromSystemTime(dt1,
st[0]);
+
dt1->SetFromMSWSysTime(
st[0]);
else
*dt1 = wxDefaultDateTime;
}
else
*dt1 = wxDefaultDateTime;
}
@@
-251,7
+250,7
@@
bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
if ( dt2 )
{
if ( flags & GDTR_MAX )
if ( dt2 )
{
if ( flags & GDTR_MAX )
-
wxMSWDateControls::FromSystemTime(dt2,
st[1]);
+
dt2->SetFromMSWSysTime(
st[1]);
else
*dt2 = wxDefaultDateTime;
}
else
*dt2 = wxDefaultDateTime;
}
@@
-274,7
+273,7
@@
wxDatePickerCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
wxDateTime dt;
if ( dtch->dwFlags == GDT_VALID )
NMDATETIMECHANGE *dtch = (NMDATETIMECHANGE *)hdr;
wxDateTime dt;
if ( dtch->dwFlags == GDT_VALID )
-
wxMSWDateControls::FromSystemTime(&dt,
dtch->st);
+
dt.SetFromMSWSysTime(
dtch->st);
// filter out duplicate DTN_DATETIMECHANGE events which the native
// control sends us when using wxDP_DROPDOWN style
// filter out duplicate DTN_DATETIMECHANGE events which the native
// control sends us when using wxDP_DROPDOWN style