Re: [Freeglut-developer] Requested Changes to "freeglut" CVS version

[Richard R. <sf...@ol...>]

On Tue, Oct 21, 2003 at 07:55:16AM -0500, Fay John F Contr AAC/WMG wrote:
> Would somebody with CVS access please make the following (minor to trivial)
> changes:
> 
> (1) In "freeglut_font.c", on lines 142 and 249, please change "A carriage
> return" to "An EOL"

Fixed.


> (2) In "freeglut_menu.c", around lines 215-220, please make the following
> changes:
> 
> <begin quote>
>            /*
>             * Set up the initial submenu position now:
>             */
>            menuEntry->SubMenu->X = menu->X + menu->Width ;
>            menuEntry->SubMenu->Y = menu->Y + menuEntry->Ordinal *
> FREEGLUT_MENU_HEIGHT ;
>    
> <!         if ( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > glutGet
> ( GLUT_SCREEN_WIDTH ) )
> !>         if ( menuEntry->SubMenu->X + menuEntry->SubMenu->Width > glutGet
> (
> !> GLUT_SCREEN_WIDTH ) )
>            menuEntry->SubMenu->X = menu->X - menuEntry->SubMenu->Width ;
>    
> <!         if ( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > glutGet
> ( GLUT_SCREEN_HEIGHT ) )
> <!           menuEntry->SubMenu->Y -= ( menuEntry->SubMenu->Height -
> FREEGLUT_MENU_HEIGHT - 2 * FREEGLUT_MENU_BORDER ) ;
> !>         if ( menuEntry->SubMenu->Y + menuEntry->SubMenu->Height > glutGet
> (
> !> GLUT_SCREEN_HEIGHT ) )
> !>         menuEntry->SubMenu->Y -=menuEntry->SubMenu->Height ;
>    
>            fgSetWindow ( menuEntry->SubMenu->Window ) ;

I think that I did what you wanted here, but it would help if you would
use a unified diff format.  ("diff -u" if you have CygWIN installed, or
on your UNIX box (BSD, LINUX, whatever).)


-- 
  "I probably don't know what I'm talking about."  http://www.olib.org/~rkr/