diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h index 95747ffd..1aae0a55 100644 --- a/include/GLFW/glfw3.h +++ b/include/GLFW/glfw3.h @@ -3914,7 +3914,7 @@ GLFWAPI void glfwRequestWindowAttention(GLFWwindow* window); * * @ingroup window */ -GLFWAPI GLFWmonitor* glfwGetMonitorHostingWindow(GLFWwindow *const window); +GLFWAPI GLFWmonitor* glfwGetMonitorDisplayingWindow(GLFWwindow* window); /*! @brief Returns the monitor that the window uses for full screen mode. * diff --git a/src/internal.h b/src/internal.h index d626f97a..31992ed5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -724,7 +724,7 @@ struct _GLFWplatform void (*showWindow)(_GLFWwindow*); void (*hideWindow)(_GLFWwindow*); void (*requestWindowAttention)(_GLFWwindow*); - _GLFWmonitor* (*getMonitorHostingWindow)(_GLFWwindow*); + _GLFWmonitor* (*getMonitorDisplayingWindow)(_GLFWwindow*); void (*focusWindow)(_GLFWwindow*); void (*setWindowMonitor)(_GLFWwindow*,_GLFWmonitor*,int,int,int,int,int); GLFWbool (*windowFocused)(_GLFWwindow*); diff --git a/src/null_init.c b/src/null_init.c index 0d015203..2cc1f2b4 100644 --- a/src/null_init.c +++ b/src/null_init.c @@ -89,7 +89,7 @@ GLFWbool _glfwConnectNull(int platformID, _GLFWplatform* platform) _glfwShowWindowNull, _glfwHideWindowNull, _glfwRequestWindowAttentionNull, - _glfwGetMonitorHostingWindowNull, + _glfwGetMonitorDisplayingWindowNull, _glfwFocusWindowNull, _glfwSetWindowMonitorNull, _glfwWindowFocusedNull, diff --git a/src/null_platform.h b/src/null_platform.h index 1c5065c4..8ed01cd2 100644 --- a/src/null_platform.h +++ b/src/null_platform.h @@ -240,7 +240,7 @@ GLFWbool _glfwRawMouseMotionSupportedNull(void); void _glfwShowWindowNull(_GLFWwindow* window); void _glfwRequestWindowAttentionNull(_GLFWwindow* window); void _glfwRequestWindowAttentionNull(_GLFWwindow* window); -_GLFWmonitor* _glfwGetMonitorHostingWindoNull(_GLFWwindow* const window); +_GLFWmonitor* _glfwGetMonitorDisplayingWindoNull(_GLFWwindow* window); void _glfwHideWindowNull(_GLFWwindow* window); void _glfwFocusWindowNull(_GLFWwindow* window); GLFWbool _glfwWindowFocusedNull(_GLFWwindow* window); diff --git a/src/null_window.c b/src/null_window.c index 920ce0f2..90245579 100644 --- a/src/null_window.c +++ b/src/null_window.c @@ -436,7 +436,7 @@ void _glfwRequestWindowAttentionNull(_GLFWwindow* window) { } -_GLFWmonitor* _glfwGetMonitorHostingWindoNull(_GLFWwindow*const window) +_GLFWmonitor* _glfwGetMonitorDisplayingWindoNull(_GLFWwindow* window) { return NULL; } diff --git a/src/win32_init.c b/src/win32_init.c index 911577b1..20029e12 100644 --- a/src/win32_init.c +++ b/src/win32_init.c @@ -653,7 +653,7 @@ GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform) _glfwShowWindowWin32, _glfwHideWindowWin32, _glfwRequestWindowAttentionWin32, - _glfwGetMonitorHostingWindowWin32, + _glfwGetMonitorDisplayingWindowWin32, _glfwFocusWindowWin32, _glfwSetWindowMonitorWin32, _glfwWindowFocusedWin32, diff --git a/src/win32_platform.h b/src/win32_platform.h index 880757d0..79d65aaf 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -558,7 +558,7 @@ void _glfwMaximizeWindowWin32(_GLFWwindow* window); void _glfwShowWindowWin32(_GLFWwindow* window); void _glfwHideWindowWin32(_GLFWwindow* window); void _glfwRequestWindowAttentionWin32(_GLFWwindow* window); -_GLFWmonitor* _glfwGetMonitorHostingWindowWin32(_GLFWwindow* const window); +_GLFWmonitor* _glfwGetMonitorDisplayingWindowWin32(_GLFWwindow* window); void _glfwFocusWindowWin32(_GLFWwindow* window); void _glfwSetWindowMonitorWin32(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate); GLFWbool _glfwWindowFocusedWin32(_GLFWwindow* window); diff --git a/src/win32_window.c b/src/win32_window.c index 58a661d7..55d0ab9c 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1762,7 +1762,7 @@ void _glfwRequestWindowAttentionWin32(_GLFWwindow* window) FlashWindow(window->win32.handle, TRUE); } -_GLFWmonitor* _glfwGetMonitorHostingWindowWin32(_GLFWwindow* const window) +_GLFWmonitor* _glfwGetMonitorDisplayingWindowWin32(_GLFWwindow* window) { HMONITOR monitor = MonitorFromWindow(window->win32.handle, MONITOR_DEFAULTTONEAREST); diff --git a/src/window.c b/src/window.c index e45e2d13..9916e493 100644 --- a/src/window.c +++ b/src/window.c @@ -822,14 +822,14 @@ GLFWAPI void glfwRequestWindowAttention(GLFWwindow* handle) _glfw.platform.requestWindowAttention(window); } -GLFWAPI GLFWmonitor* glfwGetMonitorHostingWindow(GLFWwindow* const handle) +GLFWAPI GLFWmonitor* glfwGetMonitorDisplayingWindow(GLFWwindow* handle) { _GLFWwindow* const window = (_GLFWwindow*) handle; assert(handle != NULL); _GLFW_REQUIRE_INIT_OR_RETURN(NULL); - return (GLFWmonitor*)_glfw.platform.getMonitorHostingWindow(window); + return (GLFWmonitor*)_glfw.platform.getMonitorDisplayingWindow(window); } GLFWAPI void glfwHideWindow(GLFWwindow* handle)