Add missing constants

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

diff --git a/wxPython/src/_media_rename.i b/wxPython/src/_media_rename.i
index a3c326dcca0c5434b4d725a7f01bd9ac517c69d4..b93f7ff82243f8aa724556f7c357e1c93e372334 100644 (file)
--- a/wxPython/src/_media_rename.i
+++ b/wxPython/src/_media_rename.i
@@ -6,6 +6,10 @@
 %rename(MEDIASTATE_STOPPED)                 wxMEDIASTATE_STOPPED;
 %rename(MEDIASTATE_PAUSED)                  wxMEDIASTATE_PAUSED;
 %rename(MEDIASTATE_PLAYING)                 wxMEDIASTATE_PLAYING;
+%rename(MEDIACTRLPLAYERCONTROLS_NONE)       wxMEDIACTRLPLAYERCONTROLS_NONE;
+%rename(MEDIACTRLPLAYERCONTROLS_STEP)       wxMEDIACTRLPLAYERCONTROLS_STEP;
+%rename(MEDIACTRLPLAYERCONTROLS_VOLUME)     wxMEDIACTRLPLAYERCONTROLS_VOLUME;
+%rename(MEDIACTRLPLAYERCONTROLS_DEFAULT)    wxMEDIACTRLPLAYERCONTROLS_DEFAULT;
 %rename(MediaEvent)                         wxMediaEvent;
 %rename(MediaCtrl)                          wxMediaCtrl;
 

diff --git a/wxPython/src/media.i b/wxPython/src/media.i
index d0f300f2763eea2c1118e0b74a191a66ab128a49..470dd518996ac7fb1b99d1ee5b1b5fd85db2bfd1 100644 (file)
--- a/wxPython/src/media.i
+++ b/wxPython/src/media.i
@@ -63,7 +63,12 @@ enum wxMediaCtrlPlayerControls
     wxMEDIACTRLPLAYERCONTROLS_DEFAULT
 };
 
-    
+static wxString wxMEDIABACKEND_DIRECTSHOW(wxEmptyString);
+static wxString wxMEDIABACKEND_MCI       (wxEmptyString);
+static wxString wxMEDIABACKEND_QUICKTIME (wxEmptyString);
+static wxString wxMEDIABACKEND_GSTREAMER (wxEmptyString);
+
+
 class wxMediaEvent : public wxNotifyEvent
 {
 public:
@@ -139,10 +144,19 @@ enum wxMediaState
 };
 
 
+enum wxMediaCtrlPlayerControls
+{
+    wxMEDIACTRLPLAYERCONTROLS_NONE,
+    wxMEDIACTRLPLAYERCONTROLS_STEP,
+    wxMEDIACTRLPLAYERCONTROLS_VOLUME,
+    wxMEDIACTRLPLAYERCONTROLS_DEFAULT
+};
+
 
-// 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 );
+MAKE_CONST_WXSTRING(MEDIABACKEND_GSTREAMER );
 
 //---------------------------------------------------------------------------
 

diff --git a/wxPython/wxPython/media.py b/wxPython/wxPython/media.py
index d489e9abb71751c4118605e9c9685b4e62330b4d..d2a1e711abd843b307176b9730217178986f98c1 100644 (file)
--- a/wxPython/wxPython/media.py
+++ b/wxPython/wxPython/media.py
@@ -22,6 +22,14 @@ del sys, _wx
 wxMEDIASTATE_STOPPED = wx.media.MEDIASTATE_STOPPED
 wxMEDIASTATE_PAUSED = wx.media.MEDIASTATE_PAUSED
 wxMEDIASTATE_PLAYING = wx.media.MEDIASTATE_PLAYING
+wxMEDIACTRLPLAYERCONTROLS_NONE = wx.media.MEDIACTRLPLAYERCONTROLS_NONE
+wxMEDIACTRLPLAYERCONTROLS_STEP = wx.media.MEDIACTRLPLAYERCONTROLS_STEP
+wxMEDIACTRLPLAYERCONTROLS_VOLUME = wx.media.MEDIACTRLPLAYERCONTROLS_VOLUME
+wxMEDIACTRLPLAYERCONTROLS_DEFAULT = wx.media.MEDIACTRLPLAYERCONTROLS_DEFAULT
+wxMEDIABACKEND_DIRECTSHOW = wx.media.MEDIABACKEND_DIRECTSHOW
+wxMEDIABACKEND_MCI = wx.media.MEDIABACKEND_MCI
+wxMEDIABACKEND_QUICKTIME = wx.media.MEDIABACKEND_QUICKTIME
+wxMEDIABACKEND_GSTREAMER = wx.media.MEDIABACKEND_GSTREAMER
 wxMediaEvent = wx.media.MediaEvent
 wxMediaEventPtr = wx.media.MediaEventPtr
 wxMediaCtrlNameStr = wx.media.MediaCtrlNameStr