No real changes, just don't use obsolete FORCE_LINK_ME in wxMediaCtrl.

Use wxFORCE_LINK_THIS_MODULE() instead of the obsolete FORCE_LINK_ME.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index dd80e3963dbe98a062b176d3b8ba0221f0e040f9..a1d78e14f3012207c9637fdb194ca53659de9a72 100644 (file)
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -2258,8 +2258,9 @@ void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event)
 // End of wxAMMediaBackend
 //---------------------------------------------------------------------------
 
-// in source file that contains stuff you don't directly use
-#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(wxmediabackend_am)
+// 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_am)
 
 #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX

diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp
index f5c41dccd21234ce8d9454d98d67af6da91974bf..1d3bd398ccd4fcf28ab9da1af94ecd8664ca4541 100644 (file)
--- a/src/msw/mediactrl_qt.cpp
+++ b/src/msw/mediactrl_qt.cpp
@@ -1281,8 +1281,9 @@ void wxQTMediaEvtHandler::OnEraseBackground(wxEraseEvent& evt)
 //  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

diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp
index 01a10d5740240bcee17cae95fd30b1de1dc57984..fcc76a9219f39f592829917831834f49c4524a60 100644 (file)
--- a/src/msw/mediactrl_wmp10.cpp
+++ b/src/msw/mediactrl_wmp10.cpp
@@ -1452,9 +1452,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