projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set the current window before calling the window closure callback.
[freeglut]
/
freeglut-1.3
/
freeglut_init.c
diff --git
a/freeglut-1.3/freeglut_init.c
b/freeglut-1.3/freeglut_init.c
index
720fb69
..
40cc2a2
100644
(file)
--- a/
freeglut-1.3/freeglut_init.c
+++ b/
freeglut-1.3/freeglut_init.c
@@
-32,7
+32,7
@@
#define G_LOG_DOMAIN "freeglut-init"
#include "../include/GL/freeglut.h"
#define G_LOG_DOMAIN "freeglut-init"
#include "../include/GL/freeglut.h"
-#include "../include/GL/freeglut_internal.h"
+#include "freeglut_internal.h"
/*
* TODO BEFORE THE STABLE RELEASE:
/*
* TODO BEFORE THE STABLE RELEASE:
@@
-183,7
+183,10
@@
void fgInitialize( const char* displayName )
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = fgDisplay.Instance;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = fgDisplay.Instance;
- wc.hIcon = LoadIcon( NULL, IDI_WINLOGO );
+ wc.hIcon = LoadIcon( fgDisplay.Instance, "GLUT_ICON" );
+ if (!wc.hIcon)
+ wc.hIcon = LoadIcon( NULL, IDI_WINLOGO );
+
wc.hCursor = LoadCursor( NULL, IDC_ARROW );
wc.hbrBackground = NULL;
wc.lpszMenuName = NULL;
wc.hCursor = LoadCursor( NULL, IDC_ARROW );
wc.hbrBackground = NULL;
wc.lpszMenuName = NULL;
@@
-367,8
+370,8
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
* This is harmless under Win32, so let's let it stay here...
*/
#if TARGET_HOST_WIN32
* This is harmless under Win32, so let's let it stay here...
*/
#if TARGET_HOST_WIN32
- if ( !getenv( "DISPLAY" ) )
- displayName = strdup( "" );
+ if ( !getenv ( "DISPLAY" ) )
+ displayName = strdup ( "" ) ;
else
#endif
displayName = strdup( getenv( "DISPLAY" ) );
else
#endif
displayName = strdup( getenv( "DISPLAY" ) );
@@
-613,7
+616,7
@@
void FGAPIENTRY glutInitWindowSize( int width, int height )
/*
* Sets the default display mode for all new windows
*/
/*
* Sets the default display mode for all new windows
*/
-void FGAPIENTRY glutInitDisplayMode( int displayMode )
+void FGAPIENTRY glutInitDisplayMode( unsigned int displayMode )
{
/*
* We will make use of this value when creating a new OpenGL context...
{
/*
* We will make use of this value when creating a new OpenGL context...
@@
-821,7
+824,7
@@
void FGAPIENTRY glutInitDisplayString( char* displayMode )
* Grab the value string that must follow the comparison operator...
*/
if( comparison != FG_NONE && i < (gint) strlen( scanner->value.v_identifier ) )
* Grab the value string that must follow the comparison operator...
*/
if( comparison != FG_NONE && i < (gint) strlen( scanner->value.v_identifier ) )
- valueString = g_strdup( scanner->value.v_identifier + i );
+ valueString = strdup( scanner->value.v_identifier + i );
/*
* If there was a value string, convert it to integer...
/*
* If there was a value string, convert it to integer...
@@
-923,7
+926,7
@@
static int TokenLengths[] =
10, 12
};
10, 12
};
-void FGAPIENTRY glutInitDisplayString( char* displayMode )
+void FGAPIENTRY glutInitDisplayString( const char* displayMode )
{
int glut_state_flag = 0 ;
/*
{
int glut_state_flag = 0 ;
/*