interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrated utilwin.c.

This commit is contained in:
Pietro Gagliardi 2016-04-22 13:52:02 -04:00
parent 7a4c73ff92
commit 0e85afb3ff
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
windows/uipriv_windows_new.hpp
View File

@ -54,3 +54,8 @@ extern int nCmdShow;
extern HFONT hMessageFont; extern HFONT hMessageFont;
extern HBRUSH hollowBrush; extern HBRUSH hollowBrush;
extern uiInitOptions options; extern uiInitOptions options;
// utilwin.cpp
extern HWND utilWindow;
extern const char *initUtilWindow(HICON hDefaultIcon, HCURSOR hDefaultCursor);
extern void uninitUtilWindow(void);

11
windows/utilwin.c → windows/utilwin.cpp
View File

@ -1,5 +1,5 @@
// 14 may 2015 // 14 may 2015
#include "uipriv_windows.h" #include "uipriv_windows.hpp"
// The utility window is a special window that performs certain tasks internal to libui. // The utility window is a special window that performs certain tasks internal to libui.
// It is not a message-only window, and it is always hidden and disabled. // It is not a message-only window, and it is always hidden and disabled.
@ -26,7 +26,6 @@ static LRESULT CALLBACK utilWindowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
return lResult; return lResult;
switch (uMsg) { switch (uMsg) {
case WM_QUERYENDSESSION: case WM_QUERYENDSESSION:
case msgConsoleEndSession:
// TODO block handler // TODO block handler
if (shouldQuit()) { if (shouldQuit()) {
uiQuit(); uiQuit();
@ -37,7 +36,7 @@ static LRESULT CALLBACK utilWindowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, L
if (wParam != resizeTimerID) if (wParam != resizeTimerID)
break; break;
if (SetTimer(utilWindow, resizeTimerID, resizeTimerInterval, NULL) == 0) if (SetTimer(utilWindow, resizeTimerID, resizeTimerInterval, NULL) == 0)
logLastError("error resetting resize timer in utilWindowWndProc()"); logLastError(L"error resetting resize timer");
doResizes(); doResizes();
return 0; return 0;
case WM_WININICHANGE: case WM_WININICHANGE:
@ -84,9 +83,9 @@ const char *initUtilWindow(HICON hDefaultIcon, HCURSOR hDefaultCursor)
void uninitUtilWindow(void) void uninitUtilWindow(void)
{ {
if (KillTimer(utilWindow, resizeTimerID) == 0) if (KillTimer(utilWindow, resizeTimerID) == 0)
logLastError("error stopping resize timer in uninitUtilWindow()"); logLastError(L"error stopping resize timer");
if (DestroyWindow(utilWindow) == 0) if (DestroyWindow(utilWindow) == 0)
logLastError("error destroying utility window in uninitUtilWindow()"); logLastError(L"error destroying utility window");
if (UnregisterClass(utilWindowClass, hInstance) == 0) if (UnregisterClass(utilWindowClass, hInstance) == 0)
logLastError("error unregistering utility window class in uninitUtilWindow()"); logLastError(L"error unregistering utility window class");
} }