From: Robin Dunn Date: Wed, 24 Nov 2004 00:07:45 +0000 (+0000) Subject: More DLL build fixes for wxMediaCtrl X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c220a8ec4fcb4e7b620e88c76b0a84be4554b28b?ds=inline More DLL build fixes for wxMediaCtrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h index b2f24e348a..6af0cd5f26 100644 --- a/include/wx/dlimpexp.h +++ b/include/wx/dlimpexp.h @@ -79,6 +79,7 @@ # define WXMAKINGDLL_HTML # define WXMAKINGDLL_XML # define WXMAKINGDLL_XRC +# define WXMAKINGDLL_MEDIA #endif /* WXMAKINGDLL */ /* diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index 0001daa6a7..5acd9490d8 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -270,8 +270,8 @@ public: #define wxMEDIA_STOP_ID 13001 //Define our event types - we need to call DEFINE_EVENT_TYPE(EVT) later -DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID) -DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID) +DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID) +DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID) //Function type(s) our events need typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&); diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp index 6cc8e5865e..3d91560123 100644 --- a/src/common/mediactrlcmn.cpp +++ b/src/common/mediactrlcmn.cpp @@ -51,8 +51,8 @@ IMPLEMENT_CLASS(wxMediaCtrl, wxControl); IMPLEMENT_CLASS(wxMediaBackend, wxObject); IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent); -DEFINE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED); -DEFINE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_STOP); +DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED); +DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP); //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //