merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -355,5 +355,5 @@ bool wxJoystick::ReleaseCapture(void)
  m_polling = 0;
  return TRUE;
 }
-#endif
+#endif  // wxUSE_JOYSTICK