This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
		
			
				
	
	
		
			38 lines
		
	
	
		
			913 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			38 lines
		
	
	
		
			913 B
		
	
	
	
		
			C
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/joystick.h
 | |
| // Purpose:     wxJoystick base header
 | |
| // Author:      wxWidgets Team
 | |
| // Modified by:
 | |
| // Created:
 | |
| // Copyright:   (c) wxWidgets Team
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_JOYSTICK_H_BASE_
 | |
| #define _WX_JOYSTICK_H_BASE_
 | |
| 
 | |
| #include "wx/defs.h"
 | |
| 
 | |
| #if wxUSE_JOYSTICK
 | |
| 
 | |
| #if defined(__WINDOWS__)
 | |
| #include "wx/msw/joystick.h"
 | |
| #elif defined(__WXMOTIF__)
 | |
| #include "wx/unix/joystick.h"
 | |
| #elif defined(__WXGTK__)
 | |
| #include "wx/unix/joystick.h"
 | |
| #elif defined(__WXX11__)
 | |
| #include "wx/unix/joystick.h"
 | |
| #elif defined(__DARWIN__)
 | |
| #include "wx/osx/core/joystick.h"
 | |
| #elif defined(__WXMAC__)
 | |
| #include "wx/osx/joystick.h"
 | |
| #elif defined(__WXQT__)
 | |
| #include "wx/unix/joystick.h"
 | |
| #endif
 | |
| 
 | |
| #endif // wxUSE_JOYSTICK
 | |
| 
 | |
| #endif
 | |
|     // _WX_JOYSTICK_H_BASE_
 |