This commit is contained in:
Camilla Berglund
2016-07-25 19:36:25 +02:00
parent d2686c8413
commit 7be62631ae
3 changed files with 10 additions and 9 deletions
+2 -2
View File
@@ -944,7 +944,7 @@ static GLFWbool initializeAppKit(void)
// Create the Cocoa window
//
static GLFWbool createWindow(_GLFWwindow* window,
static GLFWbool createNativeWindow(_GLFWwindow* window,
const _GLFWwndconfig* wndconfig)
{
window->ns.delegate = [[GLFWWindowDelegate alloc] initWithGlfwWindow:window];
@@ -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)
+3 -2
View File
@@ -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)
+2 -2
View File
@@ -428,7 +428,7 @@ static void updateCursorImage(_GLFWwindow* window)
// Create the X11 window (and its colormap)
//
static GLFWbool createWindow(_GLFWwindow* window,
static GLFWbool createNativeWindow(_GLFWwindow* window,
const _GLFWwndconfig* wndconfig,
Visual* visual, int depth)
{
@@ -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)