Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/include/wx/unix/joystick.h b/include/wx/unix/joystick.h
index 62b4ec7effeb03729215ec0860b29b8a00d39c28..614a9d8f53194b498dc0abcf11f8d46e3d11161f 100644 (file)
--- a/include/wx/unix/joystick.h
+++ b/include/wx/unix/joystick.h
@@ -9,11 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __JOYSTICKH__
-#define __JOYSTICKH__
+#ifndef _WX_UNIX_JOYSTICK_H_
+#define _WX_UNIX_JOYSTICK_H_

 
 #include "wx/event.h"
 
 #include "wx/event.h"

-#include "wx/thread.h"

 
 class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
 
 class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 


@@ -93,5 +92,4 @@ protected:
     wxJoystickThread*   m_thread;
 };
 
     wxJoystickThread*   m_thread;
 };
 

-#endif
-    // __JOYSTICKH__
+#endif // _WX_UNIX_JOYSTICK_H_