diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 6fb925cd..3c19f04b 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -5266,7 +5266,7 @@ GLFWAPI GLFWcharmodsfun glfwSetCharModsCallback(GLFWwindow* window, GLFWcharmods * callback. * @return The previously set callback, or `NULL` if no callback was set or an * error occurred. - * + * * @callback_signature * @code * void function_name(GLFWwindow* window, @@ -5300,7 +5300,7 @@ GLFWAPI GLFWpreeditfun glfwSetPreeditCallback(GLFWwindow* window, GLFWpreeditfun * callback. * @return The previously set callback, or `NULL` if no callback was set or an * error occurred. - * + * * @callback_signature * @code * void function_name(GLFWwindow* window) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 1ac8990c..2abf7579 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -800,7 +800,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 }; const NSRect frame = [window->ns.object contentRectForFrameRect:[window->ns.object frame]]; - return NSMakeRect(frame.origin.x + x, + return NSMakeRect(frame.origin.x + x, frame.origin.y + frame.size.height - y, 0.0, h); diff --git a/src/win32_window.c b/src/win32_window.c index 31ecbc47..70f06421 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -41,8 +41,8 @@ // Returns GLFW_FALSE when the converting is not yet completed (for // Surrogate-pair processing) and the unit is assigned to the argument // `highsurrogate`. It will be used in the next unit's processing. -// -static GLFWbool convertToUTF32FromUTF16(WCHAR utf16_unit, +// +static GLFWbool convertToUTF32FromUTF16(WCHAR utf16_unit, WCHAR* highsurrogate, uint32_t* codepoint) {