Add new clipboard api and support for it in the ie backend. Also extend the sample...

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

diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index 01a10d5740240bcee17cae95fd30b1de1dc57984..2cfdb85e260f3a225a9c3c167f9da85376261654 100644 (file)
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -724,7 +724,9 @@ wxWMP10MediaBackend::wxWMP10MediaBackend()
 #ifndef WXTEST_ATL
                 m_pAX(NULL),
 #endif
-                m_pWMPPlayer(NULL)
+                m_pWMPPlayer(NULL),
+                m_pWMPSettings(NULL),
+                m_pWMPControls(NULL)
 
 {
     m_evthandler = NULL;
@@ -752,8 +754,10 @@ wxWMP10MediaBackend::~wxWMP10MediaBackend()
 #endif
 
         m_pWMPPlayer->Release();
-        m_pWMPSettings->Release();
-        m_pWMPControls->Release();
+        if (m_pWMPSettings)
+            m_pWMPSettings->Release();
+        if (m_pWMPControls)
+            m_pWMPControls->Release();
     }
 }
 
@@ -1452,9 +1456,11 @@ void wxWMP10MediaEvtHandler::OnActiveX(wxActiveXEvent& event)
 }
 
 #endif
-// in source file that contains stuff you don't directly use
-#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(wxmediabackend_wmp10)
+
+// 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_wmp10)
 
 #if 0 // Windows Media Player Mobile 9 hacks