projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changing a comment ... nothing big.
[freeglut]
/
src
/
freeglut_internal.h
diff --git
a/src/freeglut_internal.h
b/src/freeglut_internal.h
index
f0c639c
..
8182f36
100644
(file)
--- a/
src/freeglut_internal.h
+++ b/
src/freeglut_internal.h
@@
-60,7
+60,6
@@
#include <windowsx.h>
#include <mmsystem.h>
#include <TCHAR.H>
#include <windowsx.h>
#include <mmsystem.h>
#include <TCHAR.H>
-#endif
/* TODO: MinGW is lacking a prototype, this should better be handled via autoconf! */
#ifndef ChangeDisplaySettingsEx
/* TODO: MinGW is lacking a prototype, this should better be handled via autoconf! */
#ifndef ChangeDisplaySettingsEx
@@
-72,6
+71,7
@@
LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
#endif
#endif
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
#endif
#endif
+#endif
#if defined(_MSC_VER)
#define strdup _strdup
#if defined(_MSC_VER)
#define strdup _strdup
@@
-126,6
+126,8
@@
LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
# define FALSE 0
#endif
# define FALSE 0
#endif
+#define INVALID_MODIFIERS 0xffffffff
+
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
/* Freeglut callbacks type definitions */
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
/* Freeglut callbacks type definitions */
@@
-512,10
+514,10
@@
typedef struct tagSFG_MenuContext SFG_MenuContext;
struct tagSFG_MenuContext
{
#if TARGET_HOST_UNIX_X11
struct tagSFG_MenuContext
{
#if TARGET_HOST_UNIX_X11
- XVisualInfo* VisualInfo; /* The window's visual information */
+ XVisualInfo* MVisualInfo; /* The window's visual information */
#endif
#endif
- SFG_WindowContextType Context; /* The menu window's WGL context */
+ SFG_WindowContextType MContext; /* The menu window's WGL context */
};
/* This structure describes a menu */
};
/* This structure describes a menu */
@@
-784,7
+786,7
@@
int glutJoystickGetNumAxes( int ident );
int glutJoystickGetNumButtons( int ident );
int glutJoystickNotWorking( int ident );
int glutJoystickGetNumButtons( int ident );
int glutJoystickNotWorking( int ident );
-/* InputDevice Init/Fini */
+/* InputDevice Initialisation and Closure */
int fgInputDeviceDetect( void );
void fgInitialiseInputDevices( void );
void fgInputDeviceClose( void );
int fgInputDeviceDetect( void );
void fgInitialiseInputDevices( void );
void fgInputDeviceClose( void );