test wxString's char<->wchar_t ctors

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

diff --git a/wxPython/src/_joystick.i b/wxPython/src/_joystick.i
index fe2da5c0fda332e5d40f27745144c4698b5683f6..add72d6b92fab60b5f23d0b2542807646dffd95f 100644 (file)
--- a/wxPython/src/_joystick.i
+++ b/wxPython/src/_joystick.i
@@ -48,10 +48,10 @@ enum
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {
 class wxJoystick : public wxObject {
 public:
     wxJoystick(int joystick = wxJOYSTICK1) {

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

         PyErr_SetString(PyExc_NotImplementedError,
                         "wxJoystick is not available on this platform.");
         PyErr_SetString(PyExc_NotImplementedError,
                         "wxJoystick is not available on this platform.");

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
     wxPoint GetPosition() { return wxPoint(-1,-1); }
     int GetZPosition() { return -1; }
     }
     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; }
     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; }
     int GetXMin() { return -1; }
     int GetYMin() { return -1; }
     int GetZMin() { return -1; }


@@ -103,6 +103,8 @@ public:
 %}
 
 
 %}
 
 

+MustHaveApp(wxJoystick);
+

 class wxJoystick /* : public wxObject */
 {
 public:
 class wxJoystick /* : public wxObject */
 {
 public: