mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdi_native: Fix calling convention problem

Browse Source 
The calling convention of a WNDPROC is specified as being 'CALLBACK'.
This commit is contained in:
Mark Jansen 2022-11-30 18:46:56 +01:00
parent 7ae6d7dacc
commit b98732fbc8
No known key found for this signature in database
GPG Key ID: B39240EE84BEAE8B
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
demo/gdi_native_nuklear/window.h
View File

@ -44,7 +44,7 @@ struct nkgdi_window
HDC window_dc; HDC window_dc;
/* Internally used state variables */ /* Internally used state variables */
int is_open; int is_open;
int is_draggin; int is_draggin;
int ws_override; int ws_override;
int is_maximized; int is_maximized;
@ -70,9 +70,9 @@ void nkgdi_window_destroy(struct nkgdi_window* wnd);
/* Predeclare the windows window message procs */ /* Predeclare the windows window message procs */
/* This proc will setup the pointer to the window context */ /* This proc will setup the pointer to the window context */
LRESULT nkgdi_window_proc_setup(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK nkgdi_window_proc_setup(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam);
/* This proc will take the window context pointer and performs operations on it*/ /* This proc will take the window context pointer and performs operations on it*/
LRESULT nkgdi_window_proc_run(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK nkgdi_window_proc_run(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam);
void nkgdi_window_init(void) void nkgdi_window_init(void)
{ {
@ -126,7 +126,7 @@ void nkgdi_window_create(struct nkgdi_window* wnd, unsigned int width, unsigned
GetModuleHandleW(NULL), GetModuleHandleW(NULL),
wnd wnd
); );
/* Give the window the ascii char name */ /* Give the window the ascii char name */
SetWindowTextA(wnd->_internal.window_handle, name); SetWindowTextA(wnd->_internal.window_handle, name);
@ -232,7 +232,7 @@ int nkgdi_window_update(struct nkgdi_window* wnd)
return wnd->_internal.is_open; return wnd->_internal.is_open;
} }
LRESULT nkgdi_window_proc_setup(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK nkgdi_window_proc_setup(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
/* Waiting to receive the NCCREATE message with the custom window data */ /* Waiting to receive the NCCREATE message with the custom window data */
if (msg == WM_NCCREATE) if (msg == WM_NCCREATE)
@ -253,11 +253,11 @@ LRESULT nkgdi_window_proc_setup(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam
return DefWindowProc(wnd, msg, wParam, lParam); return DefWindowProc(wnd, msg, wParam, lParam);
} }
LRESULT nkgdi_window_proc_run(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK nkgdi_window_proc_run(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
/* The window context is extracted from the window data */ /* The window context is extracted from the window data */
struct nkgdi_window* nkwnd = (struct nkgdi_window*)GetWindowLongPtrW(wnd, GWLP_USERDATA); struct nkgdi_window* nkwnd = (struct nkgdi_window*)GetWindowLongPtrW(wnd, GWLP_USERDATA);
/* Switch on the message code to handle all required messages */ /* Switch on the message code to handle all required messages */
switch (msg) switch (msg)
{ {
@ -267,7 +267,7 @@ LRESULT nkgdi_window_proc_run(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam)
if(!nkwnd->cb_on_close || nkwnd->cb_on_close()) if(!nkwnd->cb_on_close || nkwnd->cb_on_close())
nkwnd->_internal.is_open = 0; nkwnd->_internal.is_open = 0;
return 0; /* No default behaviour. We do it our own way */ return 0; /* No default behaviour. We do it our own way */
/* Window sizing event (is currently beeing sized) */ /* Window sizing event (is currently beeing sized) */
case WM_SIZING: case WM_SIZING:
{ {