dll fixes for media lib

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

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index fd823a514436d4be9d094d50fb73a1d9c181d5e5..b2f24e348ad086e4e48f1f453ad3ebfdc86e8eda 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -186,6 +186,14 @@
 #    define WXDLLIMPEXP_XRC
 #endif
 
+#ifdef WXMAKINGDLL_MEDIA
+#    define WXDLLIMPEXP_MEDIA WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_MEDIA WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_MEDIA
+#endif
+
 /* for backwards compatibility, define suffix-less versions too */
 #define WXDLLEXPORT WXDLLIMPEXP_CORE
 #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE

diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h
index 54b0573eacb4396378540a5652cfd37d6d8dc518..0001daa6a721d82573da57cbf1c943f7ed29e517 100644 (file)
--- a/include/wx/mediactrl.h
+++ b/include/wx/mediactrl.h
@@ -70,7 +70,7 @@ enum wxMediaTimeFormat
 //
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMediaEvent : public wxNotifyEvent
+class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
 {
 public:
     // ------------------------------------------------------------------------
@@ -111,7 +111,7 @@ public:
 //
 // ----------------------------------------------------------------------------
 
-class wxMediaCtrl : public wxControl
+class WXDLLIMPEXP_MEDIA wxMediaCtrl : public wxControl
 {
 public:
     wxMediaCtrl() : m_imp(NULL), m_bLoaded(false), m_bLoop(false)
@@ -211,7 +211,7 @@ protected:
 //
 // ----------------------------------------------------------------------------
 
-class wxMediaBackend : public wxObject
+class WXDLLIMPEXP_MEDIA wxMediaBackend : public wxObject
 {
 public:
     wxMediaBackend()
@@ -270,8 +270,8 @@ public:
 #define wxMEDIA_STOP_ID    13001
 
 //Define our event types - we need to call DEFINE_EVENT_TYPE(EVT) later
-DECLARE_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
-DECLARE_EVENT_TYPE(wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID)
+DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
+DECLARE_LOCAL_EVENT_TYPE(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 3d91560123e5f0196e6e1e351c65b574b9eb030a..6cc8e5865ed7fed1734c848ccdaa33e02e094819 100644 (file)
--- 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_EVENT_TYPE(wxEVT_MEDIA_FINISHED);
-DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP);
+DEFINE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED);
+DEFINE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_STOP);
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //

diff --git a/src/mac/carbon/mediactrl.cpp b/src/mac/carbon/mediactrl.cpp
index b5d21a3b83ad224a36d0c9e087adcc0f39b28754..561bc3efb8a600edf58aad51dba6993d81b229d7 100644 (file)
--- a/src/mac/carbon/mediactrl.cpp
+++ b/src/mac/carbon/mediactrl.cpp
@@ -68,7 +68,7 @@ Boolean _wxIsQuickTime4Installed (void)
     return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400);
 }
 
-class wxQTMediaBackend : public wxMediaBackend
+class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackend
 {
 public:
 

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 80521b517b05958cbf48605ede691b07c50f71dc..3de8356a08e9cbf82049cbb176e5f0214c5eb70d 100644 (file)
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -68,7 +68,7 @@ extern const wxChar *wxCanvasClassName;
 //---------------------------------------------------------------------------
 #include <dshow.h>
 
-class wxAMMediaBackend : public wxMediaBackend
+class WXDLLIMPEXP_MEDIA wxAMMediaBackend : public wxMediaBackend
 {
 public:
     wxAMMediaBackend();
@@ -141,7 +141,7 @@ public:
 //---------------------------------------------------------------------------
 #include <mmsystem.h>
 
-class wxMCIMediaBackend : public wxMediaBackend
+class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackend
 {
 public:
 
@@ -206,7 +206,7 @@ public:
 #include <qtml.h>                   //Windoze QT include
 #include <QuickTimeComponents.h>    //Standard QT stuff
 
-class wxQTMediaBackend : public wxMediaBackend
+class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackend
 {
 public: