FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stripped out the now truly extraneous {braces} in such forms as:

Browse Source 
if( ... )
{
    INVOKE_WCB( ... );
}

Check for compiling on WIN32.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@322 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-07 15:50:56 +00:00
parent 9108ab693f
commit d7896b09ab
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
freeglut/freeglut/src/freeglut_main.c
View File

@ -656,16 +656,12 @@ void FGAPIENTRY glutMainLoopEvent( void )
(event.xmotion.state & Button3Mask) || (event.xmotion.state & Button3Mask) ||
(event.xmotion.state & Button4Mask) || (event.xmotion.state & Button4Mask) ||
(event.xmotion.state & Button5Mask) ) (event.xmotion.state & Button5Mask) )
{
INVOKE_WCB( *window, Motion, ( event.xmotion.x, INVOKE_WCB( *window, Motion, ( event.xmotion.x,
event.xmotion.y ) ); event.xmotion.y ) );
}
else else
{
INVOKE_WCB( *window, Passive, ( event.xmotion.x, INVOKE_WCB( *window, Passive, ( event.xmotion.x,
event.xmotion.y ) ); event.xmotion.y ) );
} }
}
break; break;
case ButtonRelease: case ButtonRelease:
@ -795,13 +791,11 @@ void FGAPIENTRY glutMainLoopEvent( void )
* XXX Use a symbolic constant, *not* "4"! * XXX Use a symbolic constant, *not* "4"!
*/ */
if( ( button < 3 ) || ( ! FETCH_WCB( *window, MouseWheel ) ) ) if( ( button < 3 ) || ( ! FETCH_WCB( *window, MouseWheel ) ) )
{
INVOKE_WCB( *window, Mouse, ( button, INVOKE_WCB( *window, Mouse, ( button,
pressed ? GLUT_DOWN : GLUT_UP, pressed ? GLUT_DOWN : GLUT_UP,
event.xbutton.x, event.xbutton.x,
event.xbutton.y ) event.xbutton.y )
); );
}
else else
{ {
/* /*
@ -1272,15 +1266,11 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
if( ( wParam & MK_LBUTTON ) || if( ( wParam & MK_LBUTTON ) ||
( wParam & MK_MBUTTON ) || ( wParam & MK_MBUTTON ) ||
( wParam & MK_RBUTTON ) ) ( wParam & MK_RBUTTON ) )
{
INVOKE_WCB( *window, Motion, ( window->State.MouseX, INVOKE_WCB( *window, Motion, ( window->State.MouseX,
window->State.MouseY ) ); window->State.MouseY ) );
}
else else
{
INVOKE_WCB( *window, Passive, ( window->State.MouseX, INVOKE_WCB( *window, Passive, ( window->State.MouseX,
window->State.MouseY ) ); window->State.MouseY ) );
}
window->State.Modifiers = 0xffffffff; window->State.Modifiers = 0xffffffff;
} }
@ -1443,7 +1433,6 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
while( ticks-- ) while( ticks-- )
if( FETCH_WCB( *window, MouseWheel ) ) if( FETCH_WCB( *window, MouseWheel ) )
{
INVOKE_WCB( *window, MouseWheel, INVOKE_WCB( *window, MouseWheel,
( wheel_number, ( wheel_number,
direction, direction,
@ -1451,7 +1440,6 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
window->State.MouseY window->State.MouseY
) )
); );
}
else /* No mouse wheel, call the mouse button callback twice */ else /* No mouse wheel, call the mouse button callback twice */
{ {
/* /*