mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Camilla Löwy 2022-03-09 23:06:13 +01:00 committed by Camilla Löwy
parent aa803f7de5
commit 8f9ff8503e
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/win32_window.c
View File

@ -97,8 +97,7 @@ static const GLFWimage* chooseImage(int count, const GLFWimage* images,
// Creates an RGBA icon or cursor // Creates an RGBA icon or cursor
// //
static HICON createIcon(const GLFWimage* image, static HICON createIcon(const GLFWimage* image, int xhot, int yhot, GLFWbool icon)
int xhot, int yhot, GLFWbool icon)
{ {
int i; int i;
HDC dc; HDC dc;
@ -539,8 +538,7 @@ static void maximizeWindowManually(_GLFWwindow* window)
// Window callback function (handles window messages) // Window callback function (handles window messages)
// //
static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
WPARAM wParam, LPARAM lParam)
{ {
_GLFWwindow* window = GetPropW(hWnd, L"GLFW"); _GLFWwindow* window = GetPropW(hWnd, L"GLFW");
if (!window) if (!window)
@ -1538,8 +1536,7 @@ void _glfwSetWindowTitleWin32(_GLFWwindow* window, const char* title)
_glfw_free(wideTitle); _glfw_free(wideTitle);
} }
void _glfwSetWindowIconWin32(_GLFWwindow* window, void _glfwSetWindowIconWin32(_GLFWwindow* window, int count, const GLFWimage* images)
int count, const GLFWimage* images)
{ {
HICON bigIcon = NULL, smallIcon = NULL; HICON bigIcon = NULL, smallIcon = NULL;
@ -1652,8 +1649,8 @@ void _glfwSetWindowSizeWin32(_GLFWwindow* window, int width, int height)
} }
void _glfwSetWindowSizeLimitsWin32(_GLFWwindow* window, void _glfwSetWindowSizeLimitsWin32(_GLFWwindow* window,
int minwidth, int minheight, int minwidth, int minheight,
int maxwidth, int maxheight) int maxwidth, int maxheight)
{ {
RECT area; RECT area;
@ -1691,8 +1688,8 @@ void _glfwGetFramebufferSizeWin32(_GLFWwindow* window, int* width, int* height)
} }
void _glfwGetWindowFrameSizeWin32(_GLFWwindow* window, void _glfwGetWindowFrameSizeWin32(_GLFWwindow* window,
int* left, int* top, int* left, int* top,
int* right, int* bottom) int* right, int* bottom)
{ {
RECT rect; RECT rect;
int width, height; int width, height;
@ -2189,8 +2186,8 @@ int _glfwGetKeyScancodeWin32(int key)
} }
int _glfwCreateCursorWin32(_GLFWcursor* cursor, int _glfwCreateCursorWin32(_GLFWcursor* cursor,
const GLFWimage* image, const GLFWimage* image,
int xhot, int yhot) int xhot, int yhot)
{ {
cursor->win32.handle = (HCURSOR) createIcon(image, xhot, yhot, GLFW_FALSE); cursor->win32.handle = (HCURSOR) createIcon(image, xhot, yhot, GLFW_FALSE);
if (!cursor->win32.handle) if (!cursor->win32.handle)