X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=a95027b31da906e449db148af03e7ca909d29f7f;hb=71c0f11e25b31a2a1ccec9e6a01e4abdbc90e5f2;hp=c98e520d33f9a9d4542f5c6ade4352d33efa1e4e;hpb=f4b802a47ef27c25a283a68932956fb7898771f1;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index c98e520..a95027b 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -291,7 +291,7 @@ typedef void (* FGCBAppStatus )( int ); typedef void (* FGCBAppStatusUC )( int, FGCBUserData ); /* The global callbacks type definitions */ -typedef void (* FGCBIdle )( void ); \ +typedef void (* FGCBIdle )( void ); typedef void (* FGCBIdleUC )( FGCBUserData ); typedef void (* FGCBTimer )( int ); typedef void (* FGCBTimerUC )( int, FGCBUserData ); @@ -665,7 +665,6 @@ do \ * current window. * */ -#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE) /* FIXME: also WinCE? */ #define INVOKE_WCB(window,cbname,arg_list) \ do \ { \ @@ -677,18 +676,6 @@ do \ func EXPAND_WCB( cbname )(( arg_list, userData )); \ } \ } while( 0 ) -#else -#define INVOKE_WCB(window,cbname,arg_list) \ -do \ -{ \ - if( FETCH_WCB( window, cbname ) ) \ - { \ - fgSetWindow( &window ); \ - FGCBUserData userData = FETCH_USER_DATA_WCB( window, cbname ); \ - ((FGCB ## cbname ## UC)FETCH_WCB( window, cbname )) EXPAND_WCB( cbname )(( arg_list, userData )); \ - } \ -} while( 0 ) -#endif /* * The window callbacks the user can supply us with. Should be kept portable.