From 8dc2a28945706f22842d2867dd434297c9318541 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 26 Mar 2007 16:28:26 +0000
Subject: [PATCH] Removed WindowData parameter from init().

---
 include/osgViewer/GraphicsWindowCarbon | 4 ++--
 include/osgViewer/GraphicsWindowX11    | 4 ++--
 src/osgViewer/GraphicsWindowCarbon.cpp | 2 +-
 src/osgViewer/GraphicsWindowX11.cpp    | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/osgViewer/GraphicsWindowCarbon b/include/osgViewer/GraphicsWindowCarbon
index 28efe109f..a6497dda0 100644
--- a/include/osgViewer/GraphicsWindowCarbon
+++ b/include/osgViewer/GraphicsWindowCarbon
@@ -39,7 +39,7 @@ class GraphicsWindowCarbon : public osgViewer::GraphicsWindow
         {
             _traits = traits;
 
-            init(traits ? dynamic_cast<WindowData*>(traits->inheritedWindowData.get()) : 0);
+            init();
             
             if (valid())
             {
@@ -110,7 +110,7 @@ class GraphicsWindowCarbon : public osgViewer::GraphicsWindow
 
     protected:
     
-        void init(WindowData* inheritedWindowData=0);
+        void init();
         
         void transformMouseXY(float& x, float& y);
         
diff --git a/include/osgViewer/GraphicsWindowX11 b/include/osgViewer/GraphicsWindowX11
index 01efa739f..8ed7f96b7 100644
--- a/include/osgViewer/GraphicsWindowX11
+++ b/include/osgViewer/GraphicsWindowX11
@@ -50,7 +50,7 @@ class GraphicsWindowX11 : public osgViewer::GraphicsWindow
         {
             _traits = traits;
 
-            init(traits ? dynamic_cast<WindowData*>(traits->inheritedWindowData.get()) : 0);
+            init();
             
             if (valid())
             {
@@ -137,7 +137,7 @@ class GraphicsWindowX11 : public osgViewer::GraphicsWindow
     
         bool createVisualInfo();
         
-        void init(WindowData* inheritedWindowData=0);
+        void init();
 
         void transformMouseXY(float& x, float& y);
         void adaptKey(XKeyEvent& keyevent, int& keySymbol, unsigned int& modifierMask);
diff --git a/src/osgViewer/GraphicsWindowCarbon.cpp b/src/osgViewer/GraphicsWindowCarbon.cpp
index 05ca650aa..e16e80035 100644
--- a/src/osgViewer/GraphicsWindowCarbon.cpp
+++ b/src/osgViewer/GraphicsWindowCarbon.cpp
@@ -536,7 +536,7 @@ void GraphicsWindowCarbon::setWindowDecoration(bool flag)
    _useWindowDecoration = flag;
 }
 
-void GraphicsWindowCarbon::init(WindowData* inheritedWindowData)
+void GraphicsWindowCarbon::init()
 {
     _closeRequested = false;
     _context = NULL;
diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp
index 66df5add0..d9a41942d 100644
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -367,7 +367,7 @@ void GraphicsWindowX11::useCursor(bool cursorOn)
 
 }
 
-void GraphicsWindowX11::init(WindowData* inheritedWindowData)
+void GraphicsWindowX11::init()
 {
     if (_initialized) return;
 
@@ -376,6 +376,8 @@ void GraphicsWindowX11::init(WindowData* inheritedWindowData)
         _valid = false;
         return;
     }
+    
+    WindowData* inheritedWindowData =  dynamic_cast<WindowData*>(_traits->inheritedWindowData.get());
 
     _display = XOpenDisplay(_traits->displayName().c_str());