fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / wxPython / demo / wxJoystick.py

diff --git a/wxPython/demo/wxJoystick.py b/wxPython/demo/wxJoystick.py
index df61d1db1a914543c6f3c377cacacbb949871709..2e13d8101034b1f856a548050d0c45cbc4eef11c 100644 (file)
--- a/wxPython/demo/wxJoystick.py
+++ b/wxPython/demo/wxJoystick.py
@@ -13,9 +13,13 @@ class JoystickTestPanel(wxPanel):
 
         MakeJoystickTestPanel( self, true )
 
 
         MakeJoystickTestPanel( self, true )
 

-        self.stick = wxJoystick()
-        self.stick.SetCapture(self)
-        EVT_JOYSTICK_EVENTS(self, self.OnJoystick)
+        try:
+            self.stick = wxJoystick()
+            self.stick.SetCapture(self)
+            EVT_JOYSTICK_EVENTS(self, self.OnJoystick)
+            self.UpdateFields()
+        except NotImplementedError, v:
+            wxMessageBox(str(v), "Exception Message")

 
 
     def UpdateFields(self):
 
 
     def UpdateFields(self):


@@ -66,116 +70,116 @@ class JoystickTestPanel(wxPanel):
     # WDR: methods for JoystickTestPanel
 
     def GetYPositionCtrl(self):
     # WDR: methods for JoystickTestPanel
 
     def GetYPositionCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Y_Position_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Y_Position_Ctrl)

 
     def GetXPositionCtrl(self):
 
     def GetXPositionCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_X_Position_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_X_Position_Ctrl)

 
 
     def GetVMaxCtrl(self):
 
 
     def GetVMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_V_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_V_Max_Ctrl)

 
     def GetVMinCtrl(self):
 
     def GetVMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_V_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_V_Min_Ctrl)

 
     def GetRudderMaxCtrl(self):
 
     def GetRudderMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Rudder_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Rudder_Max_Ctrl)

 
     def GetRudderMinCtrl(self):
 
     def GetRudderMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Rudder_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Rudder_Min_Ctrl)

 
     def GetMaxAxesCtrl(self):
 
     def GetMaxAxesCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Max_Axes_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Max_Axes_Ctrl)

 
     def GetMaxButtonsCtrl(self):
 
     def GetMaxButtonsCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Max_Buttons_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Max_Buttons_Ctrl)

 
     def GetZMaxCtrl(self):
 
     def GetZMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Z_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Z_Max_Ctrl)

 
     def GetYMaxCtrl(self):
 
     def GetYMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Y_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Y_Max_Ctrl)

 
     def GetYMinCtrl(self):
 
     def GetYMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Y_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Y_Min_Ctrl)

 
     def GetXMinCtrl(self):
 
     def GetXMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_X_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_X_Min_Ctrl)

 
     def GetNumSticksCtrl(self):
 
     def GetNumSticksCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Num_Sticks_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Num_Sticks_Ctrl)

 
     def GetHasPovCtsCtrl(self):
 
     def GetHasPovCtsCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_POV_CTS_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_POV_CTS_Ctrl)

 
     def GetHasVCtrl(self):
 
     def GetHasVCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_V_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_V_Ctrl)

 
     def GetHasUCtrl(self):
 
     def GetHasUCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_U_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_U_Ctrl)

 
     def GetVPositionCtrl(self):
 
     def GetVPositionCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_V_Position_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_V_Position_Ctrl)

 
     def GetUPositionCtrl(self):
 
     def GetUPositionCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_U_Position_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_U_Position_Ctrl)

 
     def GetPovPositionCtrl(self):
 
     def GetPovPositionCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_POV_Position_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_POV_Position_Ctrl)

 
     def GetButtonStateCtrl(self):
 
     def GetButtonStateCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Button_State_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Button_State_Ctrl)

 
     def GetUMaxCtrl(self):
 
     def GetUMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_U_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_U_Max_Ctrl)

 
     def GetUMinCtrl(self):
 
     def GetUMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_U_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_U_Min_Ctrl)

 
     def GetPollingMaxCtrl(self):
 
     def GetPollingMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Polling_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Polling_Max_Ctrl)

 
     def GetPollingMinCtrl(self):
 
     def GetPollingMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Polling_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Polling_Min_Ctrl)

 
     def GetNumAxesCtrl(self):
 
     def GetNumAxesCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Num_Axes_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Num_Axes_Ctrl)

 
     def GetNumButtonsCtrl(self):
 
     def GetNumButtonsCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Num_Buttons_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Num_Buttons_Ctrl)

 
     def GetXMaxCtrl(self):
 
     def GetXMaxCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_X_Max_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_X_Max_Ctrl)

 
     def GetZMinCtrl(self):
 
     def GetZMinCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Z_Min_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Z_Min_Ctrl)

 
     def GetProdNameCtrl(self):
 
     def GetProdNameCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Prod_Name_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Prod_Name_Ctrl)

 
     def GetMfgIdCtrl(self):
 
     def GetMfgIdCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Mfg_ID_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Mfg_ID_Ctrl)

 
     def GetHasPov4dirCtrl(self):
 
     def GetHasPov4dirCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_POV_4DIR_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_POV_4DIR_Ctrl)

 
     def GetHasPovCtrl(self):
 
     def GetHasPovCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_POV_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_POV_Ctrl)

 
     def GetHasZCtrl(self):
 
     def GetHasZCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_Z_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_Z_Ctrl)

 
     def GetHasRudderCtrl(self):
 
     def GetHasRudderCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Has_Rudder_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Has_Rudder_Ctrl)

 
     def GetRudderPosCtrl(self):
 
     def GetRudderPosCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Rudder_Pos_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Rudder_Pos_Ctrl)

 
     def GetPovCtsPosCtrl(self):
 
     def GetPovCtsPosCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_POV_CTS_Pos_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_POV_CTS_Pos_Ctrl)

 
     def GetZPositionCtrl(self):
 
     def GetZPositionCtrl(self):

-        return wxPyTypeCast( self.FindWindowById(ID_Z_Position_Ctrl), "wxTextCtrl" )
+        return self.FindWindowById(ID_Z_Position_Ctrl)

 
     # WDR: handler implementations for JoysticktestPanel
 
 
     # WDR: handler implementations for JoysticktestPanel