Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
f6cb0a730b
commit
64d10e6f1c
4 changed files with 77 additions and 77 deletions
|
@ -597,9 +597,9 @@ bool CDriverGL::setupDisplay()
|
||||||
// if EXTVertexShader is used, bind the standard GL arrays, and allocate constant
|
// if EXTVertexShader is used, bind the standard GL arrays, and allocate constant
|
||||||
if (!_Extensions.NVVertexProgram && !_Extensions.ARBVertexProgram && _Extensions.EXTVertexShader)
|
if (!_Extensions.NVVertexProgram && !_Extensions.ARBVertexProgram && _Extensions.EXTVertexShader)
|
||||||
{
|
{
|
||||||
_EVSPositionHandle = nglBindParameterEXT(GL_CURRENT_VERTEX_EXT);
|
_EVSPositionHandle = nglBindParameterEXT(GL_CURRENT_VERTEX_EXT);
|
||||||
_EVSNormalHandle = nglBindParameterEXT(GL_CURRENT_NORMAL);
|
_EVSNormalHandle = nglBindParameterEXT(GL_CURRENT_NORMAL);
|
||||||
_EVSColorHandle = nglBindParameterEXT(GL_CURRENT_COLOR);
|
_EVSColorHandle = nglBindParameterEXT(GL_CURRENT_COLOR);
|
||||||
|
|
||||||
if (!_EVSPositionHandle || !_EVSNormalHandle || !_EVSColorHandle)
|
if (!_EVSPositionHandle || !_EVSNormalHandle || !_EVSColorHandle)
|
||||||
{
|
{
|
||||||
|
@ -1478,7 +1478,7 @@ void CDriverGL::setMatrix2DForTextureOffsetAddrMode(const uint stage, const floa
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
void CDriverGL::enableNVTextureShader(bool enabled)
|
void CDriverGL::enableNVTextureShader(bool enabled)
|
||||||
{
|
{
|
||||||
H_AUTO_OGL(CDriverGL_enableNVTextureShader)
|
H_AUTO_OGL(CDriverGL_enableNVTextureShader)
|
||||||
|
|
||||||
|
|
|
@ -2562,60 +2562,60 @@ bool CDriverGL::setMonitorColorProperties (const CMonitorColorProperties &proper
|
||||||
#ifdef NL_OS_MAC
|
#ifdef NL_OS_MAC
|
||||||
void CDriverGL::setupApplicationMenu()
|
void CDriverGL::setupApplicationMenu()
|
||||||
{
|
{
|
||||||
NSMenu* menu;
|
NSMenu* menu;
|
||||||
NSMenuItem* menuItem;
|
NSMenuItem* menuItem;
|
||||||
NSString* title;
|
NSString* title;
|
||||||
NSString* appName;
|
NSString* appName;
|
||||||
|
|
||||||
// get the applications name from it's process info
|
// get the applications name from it's process info
|
||||||
appName = [[NSProcessInfo processInfo] processName];
|
appName = [[NSProcessInfo processInfo] processName];
|
||||||
|
|
||||||
// create an empty menu object
|
// create an empty menu object
|
||||||
menu = [[NSMenu alloc] initWithTitle:@""];
|
menu = [[NSMenu alloc] initWithTitle:@""];
|
||||||
|
|
||||||
// add the about menu item
|
// add the about menu item
|
||||||
title = [@"About " stringByAppendingString:appName];
|
title = [@"About " stringByAppendingString:appName];
|
||||||
[menu addItemWithTitle:title
|
[menu addItemWithTitle:title
|
||||||
action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
|
action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
|
||||||
|
|
||||||
// separator
|
// separator
|
||||||
[menu addItem:[NSMenuItem separatorItem]];
|
[menu addItem:[NSMenuItem separatorItem]];
|
||||||
|
|
||||||
// add the hide application menu item
|
// add the hide application menu item
|
||||||
title = [@"Hide " stringByAppendingString:appName];
|
title = [@"Hide " stringByAppendingString:appName];
|
||||||
[menu addItemWithTitle:title
|
[menu addItemWithTitle:title
|
||||||
action:@selector(hide:) keyEquivalent:@"h"];
|
action:@selector(hide:) keyEquivalent:@"h"];
|
||||||
|
|
||||||
// add the hide others menu item
|
// add the hide others menu item
|
||||||
menuItem = [menu addItemWithTitle:@"Hide Others"
|
menuItem = [menu addItemWithTitle:@"Hide Others"
|
||||||
action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
|
action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
|
||||||
[menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
|
[menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
|
||||||
|
|
||||||
// add the show all menu item
|
// add the show all menu item
|
||||||
[menu addItemWithTitle:@"Show All"
|
[menu addItemWithTitle:@"Show All"
|
||||||
action:@selector(unhideAllApplications:) keyEquivalent:@""];
|
action:@selector(unhideAllApplications:) keyEquivalent:@""];
|
||||||
|
|
||||||
// separator
|
// separator
|
||||||
[menu addItem:[NSMenuItem separatorItem]];
|
[menu addItem:[NSMenuItem separatorItem]];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
TODO on quit send EventDestroyWindowId
|
TODO on quit send EventDestroyWindowId
|
||||||
*/
|
*/
|
||||||
// add the quit menu item
|
// add the quit menu item
|
||||||
title = [@"Quit " stringByAppendingString:appName];
|
title = [@"Quit " stringByAppendingString:appName];
|
||||||
[menu addItemWithTitle:title
|
[menu addItemWithTitle:title
|
||||||
action:@selector(terminate:) keyEquivalent:@"q"];
|
action:@selector(terminate:) keyEquivalent:@"q"];
|
||||||
|
|
||||||
// create an empty menu item and put the new menu into it as a subitem
|
// create an empty menu item and put the new menu into it as a subitem
|
||||||
menuItem = [[NSMenuItem alloc] initWithTitle:@""
|
menuItem = [[NSMenuItem alloc] initWithTitle:@""
|
||||||
action:nil keyEquivalent:@""];
|
action:nil keyEquivalent:@""];
|
||||||
[menuItem setSubmenu:menu];
|
[menuItem setSubmenu:menu];
|
||||||
|
|
||||||
// create a menu for the application
|
// create a menu for the application
|
||||||
[NSApp setMainMenu:[[NSMenu alloc] initWithTitle:@""]];
|
[NSApp setMainMenu:[[NSMenu alloc] initWithTitle:@""]];
|
||||||
|
|
||||||
// attach the new menu to the applications menu
|
// attach the new menu to the applications menu
|
||||||
[[NSApp mainMenu] addItem:menuItem];
|
[[NSApp mainMenu] addItem:menuItem];
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -2834,12 +2834,12 @@ bool CDriverGL::convertBitmapToCursor(const NLMISC::CBitmap &bitmap, Cursor &cur
|
||||||
*/
|
*/
|
||||||
|
|
||||||
XRenderPictFormat *format = XRenderFindStandardFormat (_dpy, PictStandardARGB32);
|
XRenderPictFormat *format = XRenderFindStandardFormat (_dpy, PictStandardARGB32);
|
||||||
Picture picture = XRenderCreatePicture (_dpy, iconPixmap, format, 0, 0);
|
Picture picture = XRenderCreatePicture (_dpy, iconPixmap, format, 0, 0);
|
||||||
|
|
||||||
cursor = XRenderCreateCursor(_dpy, picture, (uint)hotSpotX, (uint)hotSpotY);
|
cursor = XRenderCreateCursor(_dpy, picture, (uint)hotSpotX, (uint)hotSpotY);
|
||||||
|
|
||||||
XRenderFreePicture(_dpy, picture);
|
XRenderFreePicture(_dpy, picture);
|
||||||
XFreePixmap(_dpy, iconPixmap);
|
XFreePixmap(_dpy, iconPixmap);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue