Initialize all fields of struct tm used by wxDateTime::Format().

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

diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index ca4d627ac7abc5c96b7294145b9fb5f80c4fe9b4..1d3bd398ccd4fcf28ab9da1af94ecd8664ca4541 100644 (file)
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -432,7 +432,7 @@ private:
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 
     wxQTMediaBackend *m_qtb;
     WXHWND m_hwnd;
 

-    DECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxQTMediaEvtHandler);

 };
 
 
 };
 
 


@@ -1068,11 +1068,7 @@ void wxQTMediaBackend::Cleanup()
 {
     m_bPlaying = false;
 
 {
     m_bPlaying = false;
 

-    if (m_timer)
-    {
-        delete m_timer;
-        m_timer = NULL;
-    }
+    wxDELETE(m_timer);

 
     m_lib.StopMovie(m_movie);
 
 
     m_lib.StopMovie(m_movie);
 


@@ -1285,8 +1281,9 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 //  End QT Backend
 //---------------------------------------------------------------------------
 
 //  End QT Backend
 //---------------------------------------------------------------------------
 

-// in source file that contains stuff you don't directly use
-#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(wxmediabackend_qt)
+// Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
+// file is not discarded by the linker.
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(wxmediabackend_qt)

 
 #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX
 
 #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX