From 3ddafa1078a437f239ec307b50d2ad7a3a3ba9fa Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 5 Jan 2009 17:52:41 +0000 Subject: [PATCH] From Don Leich, build fix for OSX. --- examples/osgviewerQT/QOSGWidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/osgviewerQT/QOSGWidget.cpp b/examples/osgviewerQT/QOSGWidget.cpp index 0da8d77fb..6048a245e 100644 --- a/examples/osgviewerQT/QOSGWidget.cpp +++ b/examples/osgviewerQT/QOSGWidget.cpp @@ -50,7 +50,7 @@ #include typedef HWND WindowHandle; typedef osgViewer::GraphicsWindowWin32::WindowData WindowData; -#elif defined(__APPLE__) && defined(APPLE_PRE_10_3) +#elif defined(__APPLE__) #include typedef WindowRef WindowHandle; typedef osgViewer::GraphicsWindowCarbon::WindowData WindowData; @@ -146,7 +146,11 @@ void QOSGWidget::createContext() traits->sampleBuffers = ds->getMultiSamples(); traits->samples = ds->getNumMultiSamples(); +#if defined(__APPLE__) + traits->inheritedWindowData = new WindowData(HIViewGetWindow((HIViewRef)winId())); +#else traits->inheritedWindowData = new WindowData(winId()); +#endif if (ds->getStereo()) {