mirror of
				https://github.com/glfw/glfw.git
				synced 2025-11-03 22:04:15 +00:00 
			
		
		
		
	Cleanup
This commit is contained in:
		
							parent
							
								
									d2686c8413
								
							
						
					
					
						commit
						7be62631ae
					
				@ -944,8 +944,8 @@ static GLFWbool initializeAppKit(void)
 | 
			
		||||
 | 
			
		||||
// Create the Cocoa window
 | 
			
		||||
//
 | 
			
		||||
static GLFWbool createWindow(_GLFWwindow* window,
 | 
			
		||||
                             const _GLFWwndconfig* wndconfig)
 | 
			
		||||
static GLFWbool createNativeWindow(_GLFWwindow* window,
 | 
			
		||||
                                   const _GLFWwndconfig* wndconfig)
 | 
			
		||||
{
 | 
			
		||||
    window->ns.delegate = [[GLFWWindowDelegate alloc] initWithGlfwWindow:window];
 | 
			
		||||
    if (window->ns.delegate == nil)
 | 
			
		||||
@ -1027,7 +1027,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 | 
			
		||||
    if (!initializeAppKit())
 | 
			
		||||
        return GLFW_FALSE;
 | 
			
		||||
 | 
			
		||||
    if (!createWindow(window, wndconfig))
 | 
			
		||||
    if (!createNativeWindow(window, wndconfig))
 | 
			
		||||
        return GLFW_FALSE;
 | 
			
		||||
 | 
			
		||||
    if (ctxconfig->client != GLFW_NO_API)
 | 
			
		||||
 | 
			
		||||
@ -852,7 +852,8 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
 | 
			
		||||
 | 
			
		||||
// Creates the GLFW window
 | 
			
		||||
//
 | 
			
		||||
static int createWindow(_GLFWwindow* window, const _GLFWwndconfig* wndconfig)
 | 
			
		||||
static int createNativeWindow(_GLFWwindow* window,
 | 
			
		||||
                              const _GLFWwndconfig* wndconfig)
 | 
			
		||||
{
 | 
			
		||||
    int xpos, ypos, fullWidth, fullHeight;
 | 
			
		||||
    WCHAR* wideTitle;
 | 
			
		||||
@ -986,7 +987,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 | 
			
		||||
                              const _GLFWctxconfig* ctxconfig,
 | 
			
		||||
                              const _GLFWfbconfig* fbconfig)
 | 
			
		||||
{
 | 
			
		||||
    if (!createWindow(window, wndconfig))
 | 
			
		||||
    if (!createNativeWindow(window, wndconfig))
 | 
			
		||||
        return GLFW_FALSE;
 | 
			
		||||
 | 
			
		||||
    if (ctxconfig->client != GLFW_NO_API)
 | 
			
		||||
 | 
			
		||||
@ -428,9 +428,9 @@ static void updateCursorImage(_GLFWwindow* window)
 | 
			
		||||
 | 
			
		||||
// Create the X11 window (and its colormap)
 | 
			
		||||
//
 | 
			
		||||
static GLFWbool createWindow(_GLFWwindow* window,
 | 
			
		||||
                             const _GLFWwndconfig* wndconfig,
 | 
			
		||||
                             Visual* visual, int depth)
 | 
			
		||||
static GLFWbool createNativeWindow(_GLFWwindow* window,
 | 
			
		||||
                                   const _GLFWwndconfig* wndconfig,
 | 
			
		||||
                                   Visual* visual, int depth)
 | 
			
		||||
{
 | 
			
		||||
    // Create a colormap based on the visual used by the current context
 | 
			
		||||
    window->x11.colormap = XCreateColormap(_glfw.x11.display,
 | 
			
		||||
@ -1531,7 +1531,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (!createWindow(window, wndconfig, visual, depth))
 | 
			
		||||
    if (!createNativeWindow(window, wndconfig, visual, depth))
 | 
			
		||||
        return GLFW_FALSE;
 | 
			
		||||
 | 
			
		||||
    if (ctxconfig->client != GLFW_NO_API)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user