FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed WindowData parameter from init().

Browse Source
This commit is contained in:
Robert Osfield
2007-03-26 16:28:26 +00:00
parent 1cdda0654f
commit 8dc2a28945
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgViewer/GraphicsWindowCarbon
View File

@@ -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);

4
include/osgViewer/GraphicsWindowX11
View File

@@ -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);

2
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -536,7 +536,7 @@ void GraphicsWindowCarbon::setWindowDecoration(bool flag)
_useWindowDecoration = flag;
}
void GraphicsWindowCarbon::init(WindowData* inheritedWindowData)
void GraphicsWindowCarbon::init()
{
_closeRequested = false;
_context = NULL;

4
src/osgViewer/GraphicsWindowX11.cpp
View File

@@ -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());