X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81cfe5e13e9b8a2ec8374af1f7806b05a86d4d4b..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/src/_joystick.i

diff --git a/wxPython/src/_joystick.i b/wxPython/src/_joystick.i
index fe2da5c0fd..add72d6b92 100644
--- a/wxPython/src/_joystick.i
+++ b/wxPython/src/_joystick.i
@@ -48,10 +48,10 @@ enum
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {
-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxJoystick is not available on this platform.");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
     }
     wxPoint GetPosition() { return wxPoint(-1,-1); }
     int GetZPosition() { return -1; }
@@ -68,7 +68,7 @@ public:
     int GetNumberJoysticks() { return -1; }
     int GetManufacturerId() { return -1; }
     int GetProductId() { return -1; }
-    wxString GetProductName() { return ""; }
+    wxString GetProductName() { return wxEmptyString; }
     int GetXMin() { return -1; }
     int GetYMin() { return -1; }
     int GetZMin() { return -1; }
@@ -103,6 +103,8 @@ public:
 %}
 
 
+MustHaveApp(wxJoystick);
+
 class wxJoystick /* : public wxObject */
 {
 public: