X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=progs%2Fdemos%2FOne%2Fone.c;h=6509c3b0db112a9ce66354d493a817e8bff770d8;hb=f691ba36ca8d02d1763d592843ed01921edb8979;hp=811efbf84184db3ff709049ede4b15fa84932a34;hpb=0f15fc81253f5e91c50c8e5922f981f8ee64556f;p=freeglut diff --git a/progs/demos/One/one.c b/progs/demos/One/one.c index 811efbf..6509c3b 100644 --- a/progs/demos/One/one.c +++ b/progs/demos/One/one.c @@ -307,6 +307,8 @@ int main( int argc, char** argv ) glutInit( &argc, argv ); glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE,GLUT_ACTION_GLUTMAINLOOP_RETURNS); + glutMenuStatusFunc( SampleMenuStatus ); + glutIdleFunc( SampleIdle ); subMenuA = glutCreateMenu( SampleMenu ); glutAddMenuEntry( "Sub menu A1 (01)", 1 ); @@ -333,9 +335,7 @@ int main( int argc, char** argv ) glutReshapeFunc( SampleReshape ); glutKeyboardFunc( SampleKeyboard ); glutSpecialFunc( SampleSpecial ); - glutIdleFunc( SampleIdle ); glutEntryFunc( SampleEntry ); - glutMenuStatusFunc( SampleMenuStatus ); glutAttachMenu( GLUT_LEFT_BUTTON ); glutInitWindowPosition( 200, 200 ); @@ -344,9 +344,7 @@ int main( int argc, char** argv ) glutReshapeFunc( SampleReshape ); glutKeyboardFunc( SampleKeyboard ); glutSpecialFunc( SampleSpecial ); - glutIdleFunc( SampleIdle ); glutEntryFunc( SampleEntry ); - glutMenuStatusFunc( SampleMenuStatus ); glutAttachMenu( GLUT_LEFT_BUTTON ); glutSetMenu(subMenuA); glutAttachMenu( GLUT_RIGHT_BUTTON ); @@ -379,9 +377,7 @@ int main( int argc, char** argv ) glutDisplayFunc( SampleDisplay ); glutReshapeFunc( SampleReshape ); glutKeyboardFunc( SampleGameModeKeyboard ); - glutIdleFunc( SampleIdle ); glutEntryFunc( SampleEntry ); - glutMenuStatusFunc( SampleMenuStatus ); glutSetMenu(menuID); glutAttachMenu( GLUT_LEFT_BUTTON );