X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/256c055e88a61dac1cffadaeb7b302494e7bfc31..b519803b436486ca933d750c990ef64a29551221:/wxPython/src/media.i

diff --git a/wxPython/src/media.i b/wxPython/src/media.i
index bb5471677f..03268b6872 100644
--- 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/uri.h>
 %}
 
 //----------------------------------------------------------------------
@@ -59,10 +60,10 @@ enum wxMediaTimeFormat
     wxMEDIATIMEFORMAT_TIME=0
 };
 
-class WXDLLIMPEXP_MEDIA wxMediaEvent : public wxNotifyEvent
+class wxMediaEvent : public wxNotifyEvent
 {
 public:
-    wxMediaEvent(wxEventTypL, int )    { wxPyRaiseNotImplemented(); }
+    wxMediaEvent(wxEventType, int )    { wxPyRaiseNotImplemented(); }
 };
 
 class wxMediaCtrl : public wxControl
@@ -83,7 +84,7 @@ public:
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,
-                const wxSize& .
+                const wxSize& ,
                 long style,
                 const wxString& ,
                 const wxValidator& ,
@@ -102,7 +103,7 @@ public:
                 wxWindowID ,
                 const wxURI& ,
                 const wxPoint&,
-                const wxSize& .
+                const wxSize& ,
                 long style,
                 const wxString& ,
                 const wxValidator& ,
@@ -127,6 +128,10 @@ public:
     wxLongLong GetPosition() { return 0; }
     wxLongLong GetDuration() { return 0; }
 };
+
+const wxEventType wxEVT_MEDIA_FINISHED = 0;
+const wxEventType wxEVT_MEDIA_STOP = 0;
+
 #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_WXSTRING2(MediaCtrlNameStr, "mediaCtrl");
+MAKE_CONST_WXSTRING2(MediaCtrlNameStr, wxT("mediaCtrl"));
 MustHaveApp(wxMediaCtrl);
 
 
@@ -174,7 +179,8 @@ public:
     %pythonAppend wxMediaCtrl()    ""
 
 
-    wxMediaCtrl(wxWindow* parent, wxWindowID id=-1,
+    wxMediaCtrl(wxWindow* parent,
+                wxWindowID id=-1,
                 const wxString& fileName = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
@@ -187,7 +193,8 @@ public:
 
     %extend {
         %name(MediaCtrlFromURI)
-             wxMediaCtrl(wxWindow* parent, wxWindowID id=-1,
+             wxMediaCtrl(wxWindow* parent,
+                         wxWindowID id=-1,
                          const wxString& location=wxPyEmptyString,
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
@@ -200,7 +207,8 @@ public:
                                    pos, size, style, szBackend, validator, name);
         }
 
-        bool CreateFromURI(wxWindow* parent, wxWindowID id=-1,
+        bool CreateFromURI(wxWindow* parent,
+                           wxWindowID id=-1,
                            const wxString& location=wxPyEmptyString,
                            const wxPoint& pos = wxDefaultPosition,
                            const wxSize& size = wxDefaultSize,
@@ -215,7 +223,8 @@ public:
     }
 
 
-    bool Create(wxWindow* parent, wxWindowID id=-1,
+    bool Create(wxWindow* parent,
+                wxWindowID id=-1,
                 const wxString& fileName = wxPyEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
@@ -244,9 +253,9 @@ public:
     double GetPlaybackRate();
     bool SetPlaybackRate(double dRate);
 
-    bool SetPosition(wxLongLong where);
-    wxLongLong GetPosition();
-    wxLongLong GetDuration();
+    %name(SetMediaPosition) bool SetPosition(wxLongLong where);
+    %name(GetMediaPosition) wxLongLong GetPosition();
+    %name(GetMediaDuration) wxLongLong GetDuration();
 };