AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dll fixes for media lib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton 2004-11-23 12:46:51 +00:00
parent 1d55654928
commit ff2b312fc8
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/dlimpexp.h
View File

@ -186,6 +186,14 @@
# define WXDLLIMPEXP_XRC # define WXDLLIMPEXP_XRC
#endif #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 */ /* for backwards compatibility, define suffix-less versions too */
#define WXDLLEXPORT WXDLLIMPEXP_CORE #define WXDLLEXPORT WXDLLIMPEXP_CORE
#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE

10
include/wx/mediactrl.h
View File

@ -70,7 +70,7 @@ enum wxMediaTimeFormat
// //
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLEXPORT wxMediaEvent : public wxNotifyEvent class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
{ {
public: public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -111,7 +111,7 @@ public:
// //
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxMediaCtrl : public wxControl class WXDLLIMPEXP_MEDIA wxMediaCtrl : public wxControl
{ {
public: public:
wxMediaCtrl() : m_imp(NULL), m_bLoaded(false), m_bLoop(false) 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: public:
wxMediaBackend() wxMediaBackend()
@ -270,8 +270,8 @@ public:
#define wxMEDIA_STOP_ID 13001 #define wxMEDIA_STOP_ID 13001
//Define our event types - we need to call DEFINE_EVENT_TYPE(EVT) later //Define our event types - we need to call DEFINE_EVENT_TYPE(EVT) later
DECLARE_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED, wxMEDIA_FINISHED_ID)
DECLARE_EVENT_TYPE(wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID) DECLARE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_STOP, wxMEDIA_STOP_ID)
//Function type(s) our events need //Function type(s) our events need
typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&); typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&);

4
src/common/mediactrlcmn.cpp
View File

@ -51,8 +51,8 @@
IMPLEMENT_CLASS(wxMediaCtrl, wxControl); IMPLEMENT_CLASS(wxMediaCtrl, wxControl);
IMPLEMENT_CLASS(wxMediaBackend, wxObject); IMPLEMENT_CLASS(wxMediaBackend, wxObject);
IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent); IMPLEMENT_DYNAMIC_CLASS(wxMediaEvent, wxEvent);
DEFINE_EVENT_TYPE(wxEVT_MEDIA_FINISHED); DEFINE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_FINISHED);
DEFINE_EVENT_TYPE(wxEVT_MEDIA_STOP); DEFINE_LOCAL_EVENT_TYPE(wxEVT_MEDIA_STOP);
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// //

2
src/mac/carbon/mediactrl.cpp
View File

@ -68,7 +68,7 @@ Boolean _wxIsQuickTime4Installed (void)
return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400); return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400);
} }
class wxQTMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackend
{ {
public: public:

6
src/msw/mediactrl.cpp
View File

@ -68,7 +68,7 @@ extern const wxChar *wxCanvasClassName;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <dshow.h> #include <dshow.h>
class wxAMMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxAMMediaBackend : public wxMediaBackend
{ {
public: public:
wxAMMediaBackend(); wxAMMediaBackend();
@ -141,7 +141,7 @@ public:
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <mmsystem.h> #include <mmsystem.h>
class wxMCIMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxMCIMediaBackend : public wxMediaBackend
{ {
public: public:
@ -206,7 +206,7 @@ public:
#include <qtml.h> //Windoze QT include #include <qtml.h> //Windoze QT include
#include <QuickTimeComponents.h> //Standard QT stuff #include <QuickTimeComponents.h> //Standard QT stuff
class wxQTMediaBackend : public wxMediaBackend class WXDLLIMPEXP_MEDIA wxQTMediaBackend : public wxMediaBackend
{ {
public: public: