OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0026787: Do not declare redundant macros WNT, LIN, WIN32, WIN64 within samples project files

Browse Source 
Redundant macros were removed.

Defines _WIN32, __linux__ and LININTEL were removed from qt samples *.pro files
This commit is contained in:
ski
2015-10-23 16:12:34 +03:00
committed by bugmaster
parent f1a70360a7
commit 50fe2dab24
82 changed files with 305 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/qt/Common/src/CommonSample.h
View File

@@ -3,13 +3,13 @@
#ifndef NO_COMMONSAMPLE_EXPORTS
#ifdef COMMONSAMPLE_EXPORTS
#ifdef WIN32
#ifdef _WIN32
#define COMMONSAMPLE_EXPORT __declspec( dllexport )
#else
#define COMMONSAMPLE_EXPORT
#endif
#else
#ifdef WIN32
#ifdef _WIN32
#define COMMONSAMPLE_EXPORT __declspec( dllimport )
#else
#define COMMONSAMPLE_EXPORT

4
samples/qt/Common/src/View.cxx
View File

@@ -1,4 +1,4 @@
#if !defined WNT
#if !defined _WIN32
#define QT_CLEAN_NAMESPACE /* avoid definition of INT32 and INT8 */
#endif
@@ -187,7 +187,7 @@ void View::init()
Window aWindowHandle = (Window )winId();
Handle(Aspect_DisplayConnection) aDispConnection = myContext->CurrentViewer()->Driver()->GetDisplayConnection();
Handle(Xw_Window) hWnd = new Xw_Window (aDispConnection, aWindowHandle);
#endif // WNT
#endif // _WIN32
myView->SetWindow (hWnd);
if ( !hWnd->IsMapped() )