OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0029169: Configuration - fix compilation with undefined UNICODE on Windows

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Draw/init.cxx
View File

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

14
src/OSD/OSD_Host.cxx
View File

@ -211,7 +211,8 @@ OSD_Host :: OSD_Host () {
if ( !fInit ) { if ( !fInit ) {
nSize = MAX_COMPUTERNAME_LENGTH + 1; nSize = MAX_COMPUTERNAME_LENGTH + 1;
osVerInfo.dwOSVersionInfoSize = sizeof ( OSVERSIONINFO ); ZeroMemory (&osVerInfo, sizeof(OSVERSIONINFOW));
osVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
ZeroMemory (&ms, sizeof(ms)); ZeroMemory (&ms, sizeof(ms));
ZeroMemory (szHostName, sizeof(char) * (MAX_COMPUTERNAME_LENGTH + 1)); ZeroMemory (szHostName, sizeof(char) * (MAX_COMPUTERNAME_LENGTH + 1));
@ -262,11 +263,12 @@ OSD_Host :: OSD_Host () {
hostName = szHostName; hostName = szHostName;
interAddr = Standard_CString ( hostAddr ); interAddr = Standard_CString ( hostAddr );
wsprintf ( TCollection_AsciiString aVersion = TCollection_AsciiString("Windows NT Version ") + (int )osVerInfo.dwMajorVersion + "." + (int )osVerInfo.dwMinorVersion;
osVerInfo.szCSDVersion, TEXT( "Windows NT Version %d.%d" ), if (*osVerInfo.szCSDVersion != L'\0')
osVerInfo.dwMajorVersion, osVerInfo.dwMinorVersion {
); aVersion += TCollection_AsciiString(" ") + TCollection_AsciiString (osVerInfo.szCSDVersion);
version = osVerInfo.szCSDVersion; }
version = aVersion;
fInit = TRUE; fInit = TRUE;

2
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -262,7 +262,7 @@ const Handle(Standard_Transient)& ViewerTest::WClass()
{ {
theWClass = new WNT_WClass ("GW3D_Class", (Standard_Address )AdvViewerWindowProc, theWClass = new WNT_WClass ("GW3D_Class", (Standard_Address )AdvViewerWindowProc,
CS_VREDRAW | CS_HREDRAW, 0, 0, CS_VREDRAW | CS_HREDRAW, 0, 0,
::LoadCursorW (NULL, IDC_ARROW)); ::LoadCursor (NULL, IDC_ARROW));
} }
#endif #endif
return theWClass; return theWClass;

4
src/WNT/WNT_WClass.cxx
View File

@ -48,8 +48,8 @@ WNT_WClass::WNT_WClass (const TCollection_AsciiString& theClassName,
aWinClass.cbClsExtra = theClassExtra; aWinClass.cbClsExtra = theClassExtra;
aWinClass.cbWndExtra = theWindowExtra; aWinClass.cbWndExtra = theWindowExtra;
aWinClass.hInstance = (HINSTANCE )myAppInstance; aWinClass.hInstance = (HINSTANCE )myAppInstance;
aWinClass.hIcon = theIcon != NULL ? (HICON )theIcon : LoadIconW (NULL, IDI_APPLICATION); aWinClass.hIcon = theIcon != NULL ? (HICON )theIcon : LoadIcon (NULL, IDI_APPLICATION);
aWinClass.hCursor = theCursor != NULL ? (HCURSOR )theCursor : LoadCursorW (NULL, IDC_NO); aWinClass.hCursor = theCursor != NULL ? (HCURSOR )theCursor : LoadCursor (NULL, IDC_NO);
aWinClass.hbrBackground = 0; aWinClass.hbrBackground = 0;
aWinClass.lpszMenuName = !aMenuNameW.IsEmpty() ? aMenuNameW.ToWideString() : NULL; aWinClass.lpszMenuName = !aMenuNameW.IsEmpty() ? aMenuNameW.ToWideString() : NULL;
aWinClass.lpszClassName = aClassNameW.ToWideString(); aWinClass.lpszClassName = aClassNameW.ToWideString();