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

Tiny change to make grep's life easier: Rename the fields of the menu

Browse Source 
context. Not really worth a ChangeLog entry...

IMHO it looks like we could kill the whole MenuContext stuff, it is of no
use currently and some things look strange, like e.g. having a context per
menu. The latter is not OK when a menu is attached to multiple windows.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@662 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2005-07-05 11:31:58 +00:00
parent c4c3661612
commit a3d9116d49
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freeglut/freeglut/src/freeglut_internal.h
View File

@ -514,10 +514,10 @@ typedef struct tagSFG_MenuContext SFG_MenuContext;
struct tagSFG_MenuContext struct tagSFG_MenuContext
{ {
#if TARGET_HOST_UNIX_X11 #if TARGET_HOST_UNIX_X11
XVisualInfo* VisualInfo; /* The window's visual information */ XVisualInfo* MVisualInfo; /* The window's visual information */
#endif #endif
SFG_WindowContextType Context; /* The menu window's WGL context */ SFG_WindowContextType MContext; /* The menu window's WGL context */
}; };
/* This structure describes a menu */ /* This structure describes a menu */

8
freeglut/freeglut/src/freeglut_window.c
View File

@ -380,14 +380,14 @@ void fgOpenWindow( SFG_Window* window, const char* title,
{ {
fgStructure.MenuContext = fgStructure.MenuContext =
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) ); (SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo; fgStructure.MenuContext->MVisualInfo = window->Window.VisualInfo;
fgStructure.MenuContext->Context = glXCreateContext( fgStructure.MenuContext->MContext = glXCreateContext(
fgDisplay.Display, fgStructure.MenuContext->VisualInfo, fgDisplay.Display, fgStructure.MenuContext->MVisualInfo,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
); );
} }
/* window->Window.Context = fgStructure.MenuContext->Context; */ /* window->Window.Context = fgStructure.MenuContext->MContext; */
window->Window.Context = glXCreateContext( window->Window.Context = glXCreateContext(
fgDisplay.Display, window->Window.VisualInfo, fgDisplay.Display, window->Window.VisualInfo,
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT ) NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )