wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: joystick.cpp
|
||||
// Name: src/unix/joystick.cpp
|
||||
// Purpose: wxJoystick class
|
||||
// Author: Ported to Linux by Guilhem Lavaux
|
||||
// Modified by:
|
||||
@@ -12,8 +12,6 @@
|
||||
// for compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_JOYSTICK
|
||||
|
||||
#include "wx/joystick.h"
|
||||
@@ -188,7 +186,7 @@ wxJoystick::wxJoystick(int joystick)
|
||||
if (m_device == -1)
|
||||
{
|
||||
dev_name.Printf( wxT("/dev/input/js%d"), joystick);
|
||||
m_device = open(dev_name.fn_str(), O_RDONLY);
|
||||
m_device = open(dev_name.fn_str(), O_RDONLY);
|
||||
}
|
||||
|
||||
if (m_device != -1)
|
||||
@@ -295,7 +293,7 @@ int wxJoystick::GetNumberJoysticks()
|
||||
break;
|
||||
close(fd);
|
||||
}
|
||||
|
||||
|
||||
if (j == 0) {
|
||||
for (j=0; j<4; j++) {
|
||||
dev_name.Printf(wxT("/dev/input/js%d"), j);
|
||||
@@ -305,7 +303,7 @@ int wxJoystick::GetNumberJoysticks()
|
||||
close(fd);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return j;
|
||||
}
|
||||
|
||||
@@ -489,4 +487,3 @@ bool wxJoystick::ReleaseCapture()
|
||||
return false;
|
||||
}
|
||||
#endif // wxUSE_JOYSTICK
|
||||
|
||||
|
Reference in New Issue
Block a user