X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1fcee843e89d6f170d08fb7a238d81fb9142974..e02c0a13600894068466a3e7a6035839c3ddd383:/wxPython/src/gtk/media.py

diff --git a/wxPython/src/gtk/media.py b/wxPython/src/gtk/media.py
index 6c38e24e01..414ca24e56 100644
--- a/wxPython/src/gtk/media.py
+++ b/wxPython/src/gtk/media.py
@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -6,17 +6,17 @@ Classes for a media player control
 """
 
 import _media
-
+import new
+new_instancemethod = new.instancemethod
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
     if (name == "this"):
-        if isinstance(value, class_type):
-            self.__dict__[name] = value.this
-            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
-            del value.thisown
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static) or hasattr(self,name) or (name == "thisown"):
+    if (not static) or hasattr(self,name):
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
@@ -25,10 +25,16 @@ def _swig_setattr(self,class_type,name,value):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
 import types
 try:
     _object = types.ObjectType
@@ -41,7 +47,8 @@ del types
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):
-        if hasattr(self,name) or (name in ("this", "thisown")):
+        if (name == "thisown"): return self.this.own(value)
+        if hasattr(self,name) or (name == "this"):
             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)
@@ -60,21 +67,12 @@ MEDIACTRLPLAYERCONTROLS_VOLUME = _media.MEDIACTRLPLAYERCONTROLS_VOLUME
 MEDIACTRLPLAYERCONTROLS_DEFAULT = _media.MEDIACTRLPLAYERCONTROLS_DEFAULT
 class MediaEvent(_core.NotifyEvent):
     """Proxy of C++ MediaEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMediaEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> MediaEvent"""
-        newobj = _media.new_MediaEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class MediaEventPtr(MediaEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MediaEvent
-_media.MediaEvent_swigregister(MediaEventPtr)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> MediaEvent"""
+        _media.MediaEvent_swiginit(self,_media.new_MediaEvent(*args, **kwargs))
+_media.MediaEvent_swigregister(MediaEvent)
 cvar = _media.cvar
 MEDIABACKEND_DIRECTSHOW = cvar.MEDIABACKEND_DIRECTSHOW
 MEDIABACKEND_MCI = cvar.MEDIABACKEND_MCI
@@ -85,9 +83,9 @@ MEDIABACKEND_WMP10 = cvar.MEDIABACKEND_WMP10
 
 class MediaCtrl(_core.Control):
     """Proxy of C++ MediaCtrl class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMediaCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, String fileName=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
@@ -95,10 +93,7 @@ class MediaCtrl(_core.Control):
             Validator validator=DefaultValidator, 
             String name=MediaCtrlNameStr) -> MediaCtrl
         """
-        newobj = _media.new_MediaCtrl(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _media.MediaCtrl_swiginit(self,_media.new_MediaCtrl(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -180,19 +175,17 @@ class MediaCtrl(_core.Control):
         """GetDownloadTotal(self) -> wxFileOffset"""
         return _media.MediaCtrl_GetDownloadTotal(*args, **kwargs)
 
-
-class MediaCtrlPtr(MediaCtrl):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MediaCtrl
-_media.MediaCtrl_swigregister(MediaCtrlPtr)
+    DownloadProgress = property(GetDownloadProgress,doc="See `GetDownloadProgress`") 
+    DownloadTotal = property(GetDownloadTotal,doc="See `GetDownloadTotal`") 
+    PlaybackRate = property(GetPlaybackRate,SetPlaybackRate,doc="See `GetPlaybackRate` and `SetPlaybackRate`") 
+    State = property(GetState,doc="See `GetState`") 
+    Volume = property(GetVolume,SetVolume,doc="See `GetVolume` and `SetVolume`") 
+_media.MediaCtrl_swigregister(MediaCtrl)
 MediaCtrlNameStr = cvar.MediaCtrlNameStr
 
 def PreMediaCtrl(*args, **kwargs):
     """PreMediaCtrl() -> MediaCtrl"""
     val = _media.new_PreMediaCtrl(*args, **kwargs)
-    val.thisown = 1
     return val
 
 wxEVT_MEDIA_FINISHED = _media.wxEVT_MEDIA_FINISHED