reverted Julian's unintentional breakage of wxChoice

[wxWidgets.git] / include / wx / msw / joystick.h

diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index aa97ff1252115afa4cf14b66fd8dcd0172febc55..4b15a0245e4de2ceef48a52a456d6d390772331e 100644 (file)
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __JOYSTICKH__
-#define __JOYSTICKH__
+#ifndef _WX_JOYSTICK_H_
+#define _WX_JOYSTICK_H_
 
 #ifdef __GNUG__
 #pragma interface "joystick.h"
@@ -90,4 +90,4 @@ protected:
 };
 
 #endif
-    // __JOYSTICKH__
+    // _WX_JOYSTICK_H_