X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8482f24cfc00645607f8526fde38d39e0dcaa63..b808efdb885aa82a6c34a8278119bae63c7f4183:/contrib/include/wx/mmedia/vidwin.h?ds=sidebyside

diff --git a/contrib/include/wx/mmedia/vidwin.h b/contrib/include/wx/mmedia/vidwin.h
index b8d0527f97..08b7a104e2 100644
--- a/contrib/include/wx/mmedia/vidwin.h
+++ b/contrib/include/wx/mmedia/vidwin.h
@@ -15,6 +15,10 @@
     #pragma interface "vidwin.h"
 #endif
 
+#if defined(__WINDOWS__) && !defined(__MINGW32__) && !defined(__WATCOMC__)
+// versions of Open Watcom and MinGW tested against this source does not
+// deliver "digitalv.h" required in this feature
+
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -26,7 +30,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/stream.h"
@@ -36,6 +40,7 @@
 // ----------------------------------------------------------------------------
 // wxMMedia2 headers
 
+#include "wx/mmedia/defs.h"
 #include "wx/mmedia/vidbase.h"
 
 // ----------------------------------------------------------------------------
@@ -53,7 +58,7 @@ typedef struct VIDW_Internal {
 // ----------------------------------------------------------------------------
 // Class definition
 
-class WXDLLEXPORT wxVideoWindows : public wxVideoBaseDriver {
+class WXDLLIMPEXP_MMEDIA wxVideoWindows : public wxVideoBaseDriver {
     DECLARE_DYNAMIC_CLASS(wxVideoWindows)
 protected:
     struct VIDW_Internal *m_internal;
@@ -89,7 +94,7 @@ public:
     // Return the total number of frames in the movie
     wxUint32 GetNbFrames() const;
     
-    bool IsCapable(wxVideoType v_type);
+    bool IsCapable(wxVideoType v_type) const;
     
     bool AttachOutput(wxWindow& output);
     void DetachOutput(void);
@@ -99,3 +104,5 @@ public:
 };
 
 #endif
+
+#endif