X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3200f37d25e1e0fae6c054e773701a73318657fd..730d336601a3ece761b56e7c05d1099352670a25:/src/msw/datectrl.cpp?ds=sidebyside diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp index 683c359077..2660838d00 100644 --- a/src/msw/datectrl.cpp +++ b/src/msw/datectrl.cpp @@ -40,15 +40,6 @@ #include "wx/msw/wrapcctl.h" #include "wx/msw/private.h" -#if defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 2, 4 ) -typedef struct tagNMDATETIMECHANGE -{ - NMHDR nmhdr; - DWORD dwFlags; - SYSTEMTIME st; -} NMDATETIMECHANGE; -#endif // old gcc headers - // apparently some versions of mingw define these macros erroneously #ifndef DateTime_GetSystemtime #define DateTime_GetSystemtime DateTime_GetSystemTime @@ -58,6 +49,8 @@ typedef struct tagNMDATETIMECHANGE #define DateTime_SetSystemtime DateTime_SetSystemTime #endif +IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl) + // ============================================================================ // implementation // ============================================================================ @@ -111,7 +104,7 @@ wxDatePickerCtrl::Create(wxWindow *parent, static bool s_initDone = false; // MT-ok: used from GUI thread only if ( !s_initDone ) { - if ( wxTheApp->GetComCtl32Version() < 470 ) + if ( wxApp::GetComCtl32Version() < 470 ) { wxLogError(_("This system doesn't support date picker control, please upgrade your version of comctl32.dll")); @@ -160,7 +153,7 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const // although MSDN doesn't mention it, DTS_UPDOWN doesn't work with // comctl32.dll 4.72 - if ( wxTheApp->GetComCtl32Version() > 472 && (style & wxDP_SPIN) ) + if ( wxApp::GetComCtl32Version() > 472 && (style & wxDP_SPIN) ) styleMSW |= DTS_UPDOWN; //else: drop down by default