projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some changes from John.
[freeglut]
/
src
/
freeglut_misc.c
diff --git
a/src/freeglut_misc.c
b/src/freeglut_misc.c
index
3d1ce5b
..
2af1731
100644
(file)
--- a/
src/freeglut_misc.c
+++ b/
src/freeglut_misc.c
@@
-29,8
+29,6
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#define G_LOG_DOMAIN "freeglut-misc"
-
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
#include "../include/GL/freeglut.h"
#include "freeglut_internal.h"
@@
-53,7
+51,7
@@
int FGAPIENTRY glutExtensionSupported( const char* extension )
{
const char *extensions, *start;
int FGAPIENTRY glutExtensionSupported( const char* extension )
{
const char *extensions, *start;
- const int len = strlen( extension ) ;
+ const int len = strlen( extension );
/*
* Make sure there is a current window, and thus a current context available
/*
* Make sure there is a current window, and thus a current context available
@@
-91,13
+89,7
@@
void FGAPIENTRY glutReportErrors( void )
{
GLenum error;
while( ( error = glGetError() ) != GL_NO_ERROR )
{
GLenum error;
while( ( error = glGetError() ) != GL_NO_ERROR )
-# undef G_LOG_DOMAIN
-# define G_LOG_DOMAIN ((gchar *) 0)
-
fgWarning( "GL error: %s", gluErrorString( error ) );
fgWarning( "GL error: %s", gluErrorString( error ) );
-
-# undef G_LOG_DOMAIN
-# define G_LOG_DOMAIN "freeglut_misc.c"
}
/*
}
/*
@@
-107,7
+99,7
@@
void FGAPIENTRY glutReportErrors( void )
*/
void FGAPIENTRY glutIgnoreKeyRepeat( int ignore )
{
*/
void FGAPIENTRY glutIgnoreKeyRepeat( int ignore )
{
- fgState.IgnoreKeyRepeat = ignore ? TRUE : FALSE;
+ fgState.IgnoreKeyRepeat = ignore ? GL_TRUE : GL_FALSE;
}
/*
}
/*
@@
-152,20
+144,8
@@
void FGAPIENTRY glutSetKeyRepeat( int repeatMode )
void FGAPIENTRY glutForceJoystickFunc( void )
{
freeglut_assert_ready;
void FGAPIENTRY glutForceJoystickFunc( void )
{
freeglut_assert_ready;
-
- /*
- * Is there a current window selected?
- */
freeglut_return_if_fail( fgStructure.Window != NULL );
freeglut_return_if_fail( fgStructure.Window != NULL );
-
- /*
- * Check if there is a joystick callback hooked to the current window
- */
- freeglut_return_if_fail( fgStructure.Window->Callbacks.Joystick != NULL );
-
- /*
- * Poll the joystick now, using the current window's joystick callback
- */
+ freeglut_return_if_fail( FETCH_WCB( *( fgStructure.Window ), Joystick ) );
fgJoystickPollWindow( fgStructure.Window );
}
fgJoystickPollWindow( fgStructure.Window );
}