Changeset 11207 for OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

Timestamp:

03/13/10 12:28:00 (3 years ago)

Author:

robert

Message:

Refactored the initialization of OSX windowing settings so that it's done on demand rather than on startup.

Files:

• OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

@@ -1054 +1054 @@
 class CarbonWindowingSystemInterface : public  DarwinWindowingSystemInterface {
 public:
-    CarbonWindowingSystemInterface()
-    :    DarwinWindowingSystemInterface()
-    {
+    CarbonWindowingSystemInterface() : DarwinWindowingSystemInterface()
+    {
+    }
+
+    virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits) 
+    {
+        _init();
+
+        return createGraphicsContextImplementation<PixelBufferCarbon, GraphicsWindowCarbon>(traits);
+    }
+
+    virtual void _init()
+    {
+        if (_initialized) return;
+
+        DarwinWindowingSystemInterface::init();
+
         // register application event handler and AppleEventHandler to get quit-events:
         static const EventTypeSpec menueventSpec = {kEventClassCommand, kEventCommandProcess};
@@ -1062 +1076 @@
         status = AEInstallEventHandler( kCoreEventClass, kAEQuitApplication, NewAEEventHandlerUPP(QuitAppleEventHandler), 0, false);
     }
-    
-    virtual osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits) 
-    {
-        return createGraphicsContextImplementation<PixelBufferCarbon, GraphicsWindowCarbon>(traits);
-    }
+
 };