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

0023769: Eliminate the dependence on X11 libs on Mac OS X

Browse Source 
Removed ImageUtility package as it is no longer used.
Disabled Xw package building on Mac OS X when Cocoa used.
This commit is contained in:
dbv
2013-03-15 11:47:42 +04:00
parent 8c720dc1fe
commit 872f4e44da
29 changed files with 42 additions and 1660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Visual3d/Visual3d_ViewManager.cxx
View File

@@ -75,11 +75,13 @@
#include <Visual3d_PickPath.hxx>
#include <Visual3d_SetIteratorOfSetOfView.hxx>
#ifndef WNT
# include <Xw_Window.hxx>
#else
#if defined (_WIN32) || defined(__WIN32__)
# include <WNT_Window.hxx>
#endif // WNT
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
# include <Cocoa_Window.hxx>
#else
# include <Xw_Window.hxx>
#endif
//-Aliases
@@ -954,15 +956,17 @@ Standard_Boolean Exist = Standard_False;
// Parse the list of views to find
// a view with the specified window
Visual3d_SetIteratorOfSetOfView MyIterator(MyDefinedView);
int TheWindowIdOfView;
#ifndef WNT
const Handle(Xw_Window) THEWindow = *(Handle(Xw_Window) *) &AWindow;
int TheSpecifiedWindowId = int (THEWindow->XWindow ());
#if defined(_WIN32) || defined(__WIN32__)
const Handle(WNT_Window) THEWindow = Handle(WNT_Window)::DownCast (AWindow);
int TheSpecifiedWindowId = int (THEWindow->HWindow ());
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
const Handle(Cocoa_Window) THEWindow = Handle(Cocoa_Window)::DownCast (AWindow);
NSView* TheSpecifiedWindowId = THEWindow->HView();
#else
const Handle(WNT_Window) THEWindow = *(Handle(WNT_Window) *) &AWindow;
int TheSpecifiedWindowId = int (THEWindow->HWindow ());
#endif // WNT
const Handle(Xw_Window) THEWindow = Handle(Xw_Window)::DownCast (AWindow);
int TheSpecifiedWindowId = int (THEWindow->XWindow ());
#endif
while ((! Exist) && (MyIterator.More ())) {
@@ -970,12 +974,15 @@ const Handle(WNT_Window) THEWindow = *(Handle(WNT_Window) *) &AWindow;
((MyIterator.Value ())->IsActive ()) ) {
const Handle(Aspect_Window) AspectWindow = (MyIterator.Value ())->Window ();
#ifndef WNT
const Handle(Xw_Window) theWindow = *(Handle(Xw_Window) *) &AspectWindow;
TheWindowIdOfView = int (theWindow->XWindow ());
#if defined(_WIN32) || defined(__WIN32__)
const Handle(WNT_Window) theWindow = Handle(WNT_Window)::DownCast (AspectWindow);
int TheWindowIdOfView = int (theWindow->HWindow ());
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
const Handle(Cocoa_Window) theWindow = Handle(Cocoa_Window)::DownCast (AspectWindow);
NSView* TheWindowIdOfView = theWindow->HView();
#else
const Handle(WNT_Window) theWindow = *(Handle(WNT_Window) *) &AspectWindow;
TheWindowIdOfView = int (theWindow->HWindow ());
const Handle(Xw_Window) theWindow = Handle(Xw_Window)::DownCast (AspectWindow);
int TheWindowIdOfView = int (theWindow->XWindow ());
#endif // WNT
// Comparaison on window IDs
if (TheWindowIdOfView == TheSpecifiedWindowId) {