Tiny change to make grep's life easier: Rename the fields of the menu
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:
parent
c4c3661612
commit
a3d9116d49
@ -514,10 +514,10 @@ typedef struct tagSFG_MenuContext SFG_MenuContext;
|
||||
struct tagSFG_MenuContext
|
||||
{
|
||||
#if TARGET_HOST_UNIX_X11
|
||||
XVisualInfo* VisualInfo; /* The window's visual information */
|
||||
XVisualInfo* MVisualInfo; /* The window's visual information */
|
||||
#endif
|
||||
|
||||
SFG_WindowContextType Context; /* The menu window's WGL context */
|
||||
SFG_WindowContextType MContext; /* The menu window's WGL context */
|
||||
};
|
||||
|
||||
/* This structure describes a menu */
|
||||
|
@ -380,14 +380,14 @@ void fgOpenWindow( SFG_Window* window, const char* title,
|
||||
{
|
||||
fgStructure.MenuContext =
|
||||
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
|
||||
fgStructure.MenuContext->VisualInfo = window->Window.VisualInfo;
|
||||
fgStructure.MenuContext->Context = glXCreateContext(
|
||||
fgDisplay.Display, fgStructure.MenuContext->VisualInfo,
|
||||
fgStructure.MenuContext->MVisualInfo = window->Window.VisualInfo;
|
||||
fgStructure.MenuContext->MContext = glXCreateContext(
|
||||
fgDisplay.Display, fgStructure.MenuContext->MVisualInfo,
|
||||
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
|
||||
);
|
||||
}
|
||||
|
||||
/* window->Window.Context = fgStructure.MenuContext->Context; */
|
||||
/* window->Window.Context = fgStructure.MenuContext->MContext; */
|
||||
window->Window.Context = glXCreateContext(
|
||||
fgDisplay.Display, window->Window.VisualInfo,
|
||||
NULL, ( fgState.DirectContext != GLUT_FORCE_INDIRECT_CONTEXT )
|
||||
|
Reference in New Issue
Block a user