reverted Julian's unintentional breakage of wxChoice

[wxWidgets.git] / src / os2 / joystick.cpp

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 6677277f48be151868fcbe292166c92cb0914462..e40b19826e9d8de14392cc01e45390f5bd4f5d4e 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/src/os2/joystick.cpp
@@ -1,18 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        joystick.cpp
 // Purpose:     wxJoystick class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/09/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "joystick.h"
-#endif
+#include "wx/defs.h"
 
+#if wxUSE_JOYSTICK
+
+#include "wx/string.h"
+#define INCL_PM
+#define INCL_DOS
+#include "wx/os2/private.h"
+
+#define NO_JOYGETPOSEX
+
+#include <wx/window.h>
 #include <wx/joystick.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
@@ -276,4 +284,5 @@ bool wxJoystick::ReleaseCapture()
     // TODO
     return FALSE;
 }
+#endif  // wxUSE_JOYSTICK