mirror of
https://github.com/glfw/glfw.git
synced 2024-11-15 02:34:36 +00:00
Rename hosting to displaying and remove const pointer parameters
This commit is contained in:
parent
4d743e8155
commit
e8d244387f
@ -3914,7 +3914,7 @@ GLFWAPI void glfwRequestWindowAttention(GLFWwindow* window);
|
|||||||
*
|
*
|
||||||
* @ingroup 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.
|
/*! @brief Returns the monitor that the window uses for full screen mode.
|
||||||
*
|
*
|
||||||
|
@ -724,7 +724,7 @@ struct _GLFWplatform
|
|||||||
void (*showWindow)(_GLFWwindow*);
|
void (*showWindow)(_GLFWwindow*);
|
||||||
void (*hideWindow)(_GLFWwindow*);
|
void (*hideWindow)(_GLFWwindow*);
|
||||||
void (*requestWindowAttention)(_GLFWwindow*);
|
void (*requestWindowAttention)(_GLFWwindow*);
|
||||||
_GLFWmonitor* (*getMonitorHostingWindow)(_GLFWwindow*);
|
_GLFWmonitor* (*getMonitorDisplayingWindow)(_GLFWwindow*);
|
||||||
void (*focusWindow)(_GLFWwindow*);
|
void (*focusWindow)(_GLFWwindow*);
|
||||||
void (*setWindowMonitor)(_GLFWwindow*,_GLFWmonitor*,int,int,int,int,int);
|
void (*setWindowMonitor)(_GLFWwindow*,_GLFWmonitor*,int,int,int,int,int);
|
||||||
GLFWbool (*windowFocused)(_GLFWwindow*);
|
GLFWbool (*windowFocused)(_GLFWwindow*);
|
||||||
|
@ -89,7 +89,7 @@ GLFWbool _glfwConnectNull(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwShowWindowNull,
|
_glfwShowWindowNull,
|
||||||
_glfwHideWindowNull,
|
_glfwHideWindowNull,
|
||||||
_glfwRequestWindowAttentionNull,
|
_glfwRequestWindowAttentionNull,
|
||||||
_glfwGetMonitorHostingWindowNull,
|
_glfwGetMonitorDisplayingWindowNull,
|
||||||
_glfwFocusWindowNull,
|
_glfwFocusWindowNull,
|
||||||
_glfwSetWindowMonitorNull,
|
_glfwSetWindowMonitorNull,
|
||||||
_glfwWindowFocusedNull,
|
_glfwWindowFocusedNull,
|
||||||
|
@ -240,7 +240,7 @@ GLFWbool _glfwRawMouseMotionSupportedNull(void);
|
|||||||
void _glfwShowWindowNull(_GLFWwindow* window);
|
void _glfwShowWindowNull(_GLFWwindow* window);
|
||||||
void _glfwRequestWindowAttentionNull(_GLFWwindow* window);
|
void _glfwRequestWindowAttentionNull(_GLFWwindow* window);
|
||||||
void _glfwRequestWindowAttentionNull(_GLFWwindow* window);
|
void _glfwRequestWindowAttentionNull(_GLFWwindow* window);
|
||||||
_GLFWmonitor* _glfwGetMonitorHostingWindoNull(_GLFWwindow* const window);
|
_GLFWmonitor* _glfwGetMonitorDisplayingWindoNull(_GLFWwindow* window);
|
||||||
void _glfwHideWindowNull(_GLFWwindow* window);
|
void _glfwHideWindowNull(_GLFWwindow* window);
|
||||||
void _glfwFocusWindowNull(_GLFWwindow* window);
|
void _glfwFocusWindowNull(_GLFWwindow* window);
|
||||||
GLFWbool _glfwWindowFocusedNull(_GLFWwindow* window);
|
GLFWbool _glfwWindowFocusedNull(_GLFWwindow* window);
|
||||||
|
@ -436,7 +436,7 @@ void _glfwRequestWindowAttentionNull(_GLFWwindow* window)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
_GLFWmonitor* _glfwGetMonitorHostingWindoNull(_GLFWwindow*const window)
|
_GLFWmonitor* _glfwGetMonitorDisplayingWindoNull(_GLFWwindow* window)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -653,7 +653,7 @@ GLFWbool _glfwConnectWin32(int platformID, _GLFWplatform* platform)
|
|||||||
_glfwShowWindowWin32,
|
_glfwShowWindowWin32,
|
||||||
_glfwHideWindowWin32,
|
_glfwHideWindowWin32,
|
||||||
_glfwRequestWindowAttentionWin32,
|
_glfwRequestWindowAttentionWin32,
|
||||||
_glfwGetMonitorHostingWindowWin32,
|
_glfwGetMonitorDisplayingWindowWin32,
|
||||||
_glfwFocusWindowWin32,
|
_glfwFocusWindowWin32,
|
||||||
_glfwSetWindowMonitorWin32,
|
_glfwSetWindowMonitorWin32,
|
||||||
_glfwWindowFocusedWin32,
|
_glfwWindowFocusedWin32,
|
||||||
|
@ -558,7 +558,7 @@ void _glfwMaximizeWindowWin32(_GLFWwindow* window);
|
|||||||
void _glfwShowWindowWin32(_GLFWwindow* window);
|
void _glfwShowWindowWin32(_GLFWwindow* window);
|
||||||
void _glfwHideWindowWin32(_GLFWwindow* window);
|
void _glfwHideWindowWin32(_GLFWwindow* window);
|
||||||
void _glfwRequestWindowAttentionWin32(_GLFWwindow* window);
|
void _glfwRequestWindowAttentionWin32(_GLFWwindow* window);
|
||||||
_GLFWmonitor* _glfwGetMonitorHostingWindowWin32(_GLFWwindow* const window);
|
_GLFWmonitor* _glfwGetMonitorDisplayingWindowWin32(_GLFWwindow* window);
|
||||||
void _glfwFocusWindowWin32(_GLFWwindow* window);
|
void _glfwFocusWindowWin32(_GLFWwindow* window);
|
||||||
void _glfwSetWindowMonitorWin32(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate);
|
void _glfwSetWindowMonitorWin32(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, int width, int height, int refreshRate);
|
||||||
GLFWbool _glfwWindowFocusedWin32(_GLFWwindow* window);
|
GLFWbool _glfwWindowFocusedWin32(_GLFWwindow* window);
|
||||||
|
@ -1762,7 +1762,7 @@ void _glfwRequestWindowAttentionWin32(_GLFWwindow* window)
|
|||||||
FlashWindow(window->win32.handle, TRUE);
|
FlashWindow(window->win32.handle, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
_GLFWmonitor* _glfwGetMonitorHostingWindowWin32(_GLFWwindow* const window)
|
_GLFWmonitor* _glfwGetMonitorDisplayingWindowWin32(_GLFWwindow* window)
|
||||||
{
|
{
|
||||||
HMONITOR monitor = MonitorFromWindow(window->win32.handle, MONITOR_DEFAULTTONEAREST);
|
HMONITOR monitor = MonitorFromWindow(window->win32.handle, MONITOR_DEFAULTTONEAREST);
|
||||||
|
|
||||||
|
@ -822,14 +822,14 @@ GLFWAPI void glfwRequestWindowAttention(GLFWwindow* handle)
|
|||||||
_glfw.platform.requestWindowAttention(window);
|
_glfw.platform.requestWindowAttention(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
GLFWAPI GLFWmonitor* glfwGetMonitorHostingWindow(GLFWwindow* const handle)
|
GLFWAPI GLFWmonitor* glfwGetMonitorDisplayingWindow(GLFWwindow* handle)
|
||||||
{
|
{
|
||||||
_GLFWwindow* const window = (_GLFWwindow*) handle;
|
_GLFWwindow* const window = (_GLFWwindow*) handle;
|
||||||
assert(handle != NULL);
|
assert(handle != NULL);
|
||||||
|
|
||||||
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
|
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
|
||||||
|
|
||||||
return (GLFWmonitor*)_glfw.platform.getMonitorHostingWindow(window);
|
return (GLFWmonitor*)_glfw.platform.getMonitorDisplayingWindow(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
GLFWAPI void glfwHideWindow(GLFWwindow* handle)
|
GLFWAPI void glfwHideWindow(GLFWwindow* handle)
|
||||||
|
Loading…
Reference in New Issue
Block a user