]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/_sound.i
warning fix
[wxWidgets.git] / wxPython / src / _sound.i
index b82736c12139d8497d02fea0f0bb246ab47b4a4d..27fab6cc913f4517c0127b92329133c537f00956 100644 (file)
@@ -24,9 +24,9 @@
 
 enum wxSoundFlags
 {
 
 enum wxSoundFlags
 {
-    wxSOUND_SYNC   = 0,
-    wxSOUND_ASYNC  = 1,
-    wxSOUND_LOOP   = 2
+    wxSOUND_SYNC,
+    wxSOUND_ASYNC,
+    wxSOUND_LOOP
 };
 
 
 };
 
 
@@ -71,6 +71,10 @@ public:
 
 
 
 
 
 
+MustHaveApp(wxSound);
+MustHaveApp(wxSound::Play);
+MustHaveApp(wxSound::Stop);
+
 class wxSound /*: public wxObject*/
 {
 public:
 class wxSound /*: public wxObject*/
 {
 public:
@@ -81,7 +85,8 @@ public:
             else
                 return new wxSound(fileName);
         }
             else
                 return new wxSound(fileName);
         }
-        %name(SoundFromData) wxSound(PyObject* data) {
+        %RenameCtor(SoundFromData,  wxSound(PyObject* data))
+        {
             unsigned char* buffer; int size;
             wxSound *sound = NULL;
 
             unsigned char* buffer; int size;
             wxSound *sound = NULL;
 
@@ -97,8 +102,6 @@ public:
     
     ~wxSound();
 
     
     ~wxSound();
 
-    %nokwargs Create;
-    %nokwargs Play;
     
     // Create from resource or file
     bool Create(const wxString& fileName/*, bool isResource = false*/);
     
     // Create from resource or file
     bool Create(const wxString& fileName/*, bool isResource = false*/);
@@ -108,7 +111,7 @@ public:
         %#ifndef __WXMAC__
             unsigned char* buffer;
             int size;
         %#ifndef __WXMAC__
             unsigned char* buffer;
             int size;
-            bool rv = False;
+            bool rv = false;
 
             bool blocked = wxPyBeginBlockThreads();
             if (!PyArg_Parse(data, "t#", &buffer, &size))
 
             bool blocked = wxPyBeginBlockThreads();
             if (!PyArg_Parse(data, "t#", &buffer, &size))
@@ -122,7 +125,7 @@ public:
                  PyErr_SetString(PyExc_NotImplementedError,
                                  "Create from data is not available on this platform.");
                  wxPyEndBlockThreads(blocked);
                  PyErr_SetString(PyExc_NotImplementedError,
                                  "Create from data is not available on this platform.");
                  wxPyEndBlockThreads(blocked);
-                 return False;
+                 return false;
         %#endif
         }
     }
         %#endif
         }
     }
@@ -133,16 +136,9 @@ public:
     bool Play(unsigned flags = wxSOUND_ASYNC) const;
 
     // Plays sound from filename:
     bool Play(unsigned flags = wxSOUND_ASYNC) const;
 
     // Plays sound from filename:
-    %name(PlaySound) static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC);
+    %Rename(PlaySound,  static bool, Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC));
 
 
-#ifndef __WXMAC__
     static void Stop();
     static void Stop();
-#else
-    %extend {
-        static void Stop()
-            { wxPyRaiseNotImplemented(); }
-    }
-#endif
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
 };
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
 };