gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Code Issues Projects Releases Wiki Activity

Formatting and cleanup.

Browse Source
This commit is contained in:
Camilla Berglund 2012-02-01 00:48:29 +01:00
parent 42cf91a07c
commit 017e2b3483
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cocoa_window.m
View File

@ -589,7 +589,7 @@ static GLboolean createContext(_GLFWwindow* window,
ADD_ATTR2(NSOpenGLPFAAuxBuffers, fbconfig->auxBuffers); ADD_ATTR2(NSOpenGLPFAAuxBuffers, fbconfig->auxBuffers);
if (fbconfig->stereo) if (fbconfig->stereo)
ADD_ATTR(NSOpenGLPFAStereo ); ADD_ATTR(NSOpenGLPFAStereo);
if (fbconfig->samples > 0) if (fbconfig->samples > 0)
{ {
@ -607,7 +607,7 @@ static GLboolean createContext(_GLFWwindow* window,
if (window->NSGL.pixelFormat == nil) if (window->NSGL.pixelFormat == nil)
{ {
_glfwSetError(GLFW_PLATFORM_ERROR, _glfwSetError(GLFW_PLATFORM_ERROR,
"Cocoa/NSOpenGL: Failed to create pixel format"); "Cocoa/NSOpenGL: Failed to create OpenGL pixel format");
return GL_FALSE; return GL_FALSE;
} }
@ -640,8 +640,8 @@ static GLboolean createContext(_GLFWwindow* window,
//======================================================================== //========================================================================
int _glfwPlatformOpenWindow(_GLFWwindow* window, int _glfwPlatformOpenWindow(_GLFWwindow* window,
const _GLFWwndconfig *wndconfig, const _GLFWwndconfig* wndconfig,
const _GLFWfbconfig *fbconfig) const _GLFWfbconfig* fbconfig)
{ {
// We can only have one application delegate, but we only allocate it the // We can only have one application delegate, but we only allocate it the
// first time we create a window to keep all window code in this file // first time we create a window to keep all window code in this file
@ -674,12 +674,6 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window,
else if (colorBits < 15) else if (colorBits < 15)
colorBits = 15; colorBits = 15;
// Ignored hints:
// OpenGLMajor, OpenGLMinor, OpenGLForward:
// pending Mac OS X support for OpenGL 3.x
// OpenGLDebug
// pending it meaning anything on Mac OS X
// Don't use accumulation buffer support; it's not accelerated // Don't use accumulation buffer support; it's not accelerated
// Aux buffers probably aren't accelerated either // Aux buffers probably aren't accelerated either
@ -718,11 +712,7 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window,
{ {
CGCaptureAllDisplays(); CGCaptureAllDisplays();
CGDisplaySwitchToMode(CGMainDisplayID(), fullscreenMode); CGDisplaySwitchToMode(CGMainDisplayID(), fullscreenMode);
}
if (wndconfig->mode == GLFW_FULLSCREEN)
{
// TODO: Make this work on pre-Leopard systems
[[window->NS.window contentView] enterFullScreenMode:[NSScreen mainScreen] [[window->NS.window contentView] enterFullScreenMode:[NSScreen mainScreen]
withOptions:nil]; withOptions:nil];
} }