Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-09-09 20:33:56 +00:00
parent 9b10161eb6
commit 6161dd2d48
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/mediactrl_am.cpp
View File

@@ -2258,8 +2258,9 @@ void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event)
// End of wxAMMediaBackend // End of wxAMMediaBackend
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// in source file that contains stuff you don't directly use // Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
#include "wx/html/forcelnk.h" // file is not discarded by the linker.
FORCE_LINK_ME(wxmediabackend_am) #include "wx/link.h"
wxFORCE_LINK_THIS_MODULE(wxmediabackend_am)
#endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX

7
src/msw/mediactrl_qt.cpp
View File

@@ -1281,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 // Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
#include "wx/html/forcelnk.h" // file is not discarded by the linker.
FORCE_LINK_ME(wxmediabackend_qt) #include "wx/link.h"
wxFORCE_LINK_THIS_MODULE(wxmediabackend_qt)
#endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX #endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX

8
src/msw/mediactrl_wmp10.cpp
View File

@@ -1452,9 +1452,11 @@ void wxWMP10MediaEvtHandler::OnActiveX(wxActiveXEvent& event)
} }
#endif #endif
// in source file that contains stuff you don't directly use
#include "wx/html/forcelnk.h" // Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
FORCE_LINK_ME(wxmediabackend_wmp10) // 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 #if 0 // Windows Media Player Mobile 9 hacks