Fixes for the stubbed version so it will compile

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

diff --git a/wxPython/src/media.i b/wxPython/src/media.i
index bb5471677f91d1d22d9aef7599a09b381d3d29b3..c3e549df9bea392a9876585d1e432c2b2cb69553 100644 (file)
--- a/wxPython/src/media.i
+++ b/wxPython/src/media.i
@@ -22,6 +22,7 @@
 #include "wx/wxPython/pyclasses.h"
 
 #include <wx/mediactrl.h>
 #include "wx/wxPython/pyclasses.h"
 
 #include <wx/mediactrl.h>

+#include <wx/uri.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -62,7 +63,7 @@ enum wxMediaTimeFormat
 class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
 {
 public:
 class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
 {
 public:

-    wxMediaEvent(wxEventTypL, int )    { wxPyRaiseNotImplemented(); }
+    wxMediaEvent(wxEventType, int )    { wxPyRaiseNotImplemented(); }

 };
 
 class wxMediaCtrl : public wxControl
 };
 
 class wxMediaCtrl : public wxControl


@@ -83,7 +84,7 @@ public:
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,

-                const wxSize& .
+                const wxSize& ,

                 long style,
                 const wxString& ,
                 const wxValidator& ,
                 long style,
                 const wxString& ,
                 const wxValidator& ,


@@ -102,7 +103,7 @@ public:
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,

-                const wxSize& .
+                const wxSize& ,

                 long style,
                 const wxString& ,
                 const wxValidator& ,
                 long style,
                 const wxString& ,
                 const wxValidator& ,


@@ -127,6 +128,10 @@ public:
     wxLongLong GetPosition() { return 0; }
     wxLongLong GetDuration() { return 0; }
 };
     wxLongLong GetPosition() { return 0; }
     wxLongLong GetDuration() { return 0; }
 };

+
+const wxEventType wxEVT_MEDIA_FINISHED = 0;
+const wxEventType wxEVT_MEDIA_STOP = 0;
+

 #endif
 %}
 
 #endif
 %}
 


@@ -147,9 +152,9 @@ enum wxMediaTimeFormat
 };
 
 
 };
 
 

-MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
-MAKE_CONST_WXSTRING(MEDIABACKEND_MCI       );
-MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME );
+// MAKE_CONST_WXSTRING(MEDIABACKEND_DIRECTSHOW);
+// MAKE_CONST_WXSTRING(MEDIABACKEND_MCI       );
+// MAKE_CONST_WXSTRING(MEDIABACKEND_QUICKTIME );

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -163,7 +168,7 @@ public:
 //---------------------------------------------------------------------------
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 //---------------------------------------------------------------------------
 
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);

-MAKE_CONST_WXSTRING2(MediaCtrlNameStr, "mediaCtrl");
+MAKE_CONST_WXSTRING2(MediaCtrlNameStr, wxT("mediaCtrl"));

 MustHaveApp(wxMediaCtrl);
 
 
 MustHaveApp(wxMediaCtrl);