1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0029169: Configuration - fix compilation with undefined UNICODE on Windows

Eliminated usage of TEXT macros, usage of OSVERSIONINFO instead of OSVERSIONINFOW.
LoadIcon/LoadCursor are now used instead of LoadIconW/LoadCursorW
when passing macros to standard resources (which depend on UNICODE flag).
This commit is contained in:
kgv
2017-09-30 19:52:10 +03:00
committed by bugmaster
parent 03d960b8de
commit c85a994a37
4 changed files with 14 additions and 12 deletions

View File

@@ -42,15 +42,15 @@ BOOL RegisterAppClass(HINSTANCE hInstance)
// Parametres communs aux classes
//-----
wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_CLASSDC;
wndClass.cbClsExtra = 0;
wndClass.hCursor = LoadCursorW (NULL, IDC_ARROW);
wndClass.cbClsExtra = 0;
wndClass.hCursor = LoadCursor (NULL, IDC_ARROW);
wndClass.hInstance = hInstance;
// Enregistrement de la fenetre principale
//-----
wndClass.cbWndExtra = sizeof(void*);
wndClass.lpfnWndProc = (WNDPROC)WndProc;
wndClass.hIcon = (HICON )LoadIconW (hInstance, MAKEINTRESOURCE(IDI_ICON1));
wndClass.hIcon = LoadIconW (hInstance, MAKEINTRESOURCEW(IDI_ICON1));
wndClass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
wndClass.lpszMenuName = MAKEINTRESOURCEW(APPMENU);
wndClass.lpszClassName = APPCLASS;