reSWIGged

[wxWidgets.git] / wxPython / src / _sound.i

diff --git a/wxPython/src/_sound.i b/wxPython/src/_sound.i
index 5569a08bfec3d25741897809a762e5d7389feba8..bed230c51cc2e57dc6aca5b925b236b6d03f7578 100644 (file)
--- a/wxPython/src/_sound.i
+++ b/wxPython/src/_sound.i
@@ -38,19 +38,19 @@ class wxSound : public wxObject
 {
 public:
     wxSound() {
 {
 public:
     wxSound() {

-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         wxPyEndBlockThreads(blocked);
     }
     wxSound(const wxString&/*, bool*/) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         wxPyEndBlockThreads(blocked);
     }
     wxSound(const wxString&/*, bool*/) {

-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         wxPyEndBlockThreads(blocked);
     }
     wxSound(int, const wxByte*) {
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         wxPyEndBlockThreads(blocked);
     }
     wxSound(int, const wxByte*) {

-        bool blocked = wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         wxPyEndBlockThreads(blocked);
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxSound is not available on this platform.");
         wxPyEndBlockThreads(blocked);


@@ -90,7 +90,7 @@ public:
             unsigned char* buffer; int size;
             wxSound *sound = NULL;
 
             unsigned char* buffer; int size;
             wxSound *sound = NULL;
 

-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             if (!PyArg_Parse(data, "t#", &buffer, &size))
                 goto done;
             sound = new wxSound(size, buffer);
             if (!PyArg_Parse(data, "t#", &buffer, &size))
                 goto done;
             sound = new wxSound(size, buffer);


@@ -113,7 +113,7 @@ public:
             int size;
             bool rv = false;
 
             int size;
             bool rv = false;
 

-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             if (!PyArg_Parse(data, "t#", &buffer, &size))
                 goto done;
             rv = self->Create(size, buffer);
             if (!PyArg_Parse(data, "t#", &buffer, &size))
                 goto done;
             rv = self->Create(size, buffer);


@@ -121,7 +121,7 @@ public:
             wxPyEndBlockThreads(blocked);
             return rv;
         %#else
             wxPyEndBlockThreads(blocked);
             return rv;
         %#else

-                 bool blocked = wxPyBeginBlockThreads();
+                 wxPyBlock_t blocked = wxPyBeginBlockThreads();

                  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);


@@ -138,14 +138,7 @@ public:
     // Plays sound from filename:
     %Rename(PlaySound,  static bool, Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC));
 
     // Plays sound from filename:
     %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() }
 };