From ca77f5223e46a80b8e318014c0e6290f8a2545d4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 1 Jul 2016 09:52:35 +0100
Subject: [PATCH] Moved unused member variables to #if 0 blocks. Added
 initiliazer

---
 src/osgPlugins/cfg/RenderSurface.cpp | 2 +-
 src/osgPlugins/cfg/RenderSurface.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osgPlugins/cfg/RenderSurface.cpp b/src/osgPlugins/cfg/RenderSurface.cpp
index caf696d7f..ffa4b9e3f 100644
--- a/src/osgPlugins/cfg/RenderSurface.cpp
+++ b/src/osgPlugins/cfg/RenderSurface.cpp
@@ -49,7 +49,7 @@ RenderSurface::RenderSurface( void )
     _drawableType    = DrawableType_Window;
     _hostname        = "";
     _displayNum     = 0;
-//     _screen          = 0;
+    _screen          = 0;
     _mayFullScreen   = true;
     _isFullScreen    = true;
 
diff --git a/src/osgPlugins/cfg/RenderSurface.h b/src/osgPlugins/cfg/RenderSurface.h
index 09e4baa86..964d7f1ab 100644
--- a/src/osgPlugins/cfg/RenderSurface.h
+++ b/src/osgPlugins/cfg/RenderSurface.h
@@ -451,7 +451,6 @@ class RenderSurface : public osg::Referenced
         std::vector<int> &getPBufferUserAttributes();
 
     private :
-        unsigned int _refreshRate;
 #ifdef _X11_IMPLEMENTATION
         int (*__glxGetRefreshRateSGI)(unsigned int *);
         int (*__glxGetVideoSyncSGI)(unsigned int *);
@@ -467,6 +466,7 @@ class RenderSurface : public osg::Referenced
         void _setCursor(Cursor);
         void _setCursorToDefault();
         void _positionPointer(int x, int y);
+        unsigned int _refreshRate;
         void _resizeWindow();
 #endif
         bool _overrideRedirectFlag;
@@ -494,9 +494,9 @@ class RenderSurface : public osg::Referenced
         Display *          _dpy;
         Window             _win;
         Window             _parent;
+        unsigned int       _parentWindowHeight;
 #endif
         RenderSurface      *_readDrawableRenderSurface;
-        unsigned int       _parentWindowHeight;
         bool               _realized;
         osg::ref_ptr< VisualChooser >  _visualChooser;
 #if 0
@@ -507,11 +507,11 @@ class RenderSurface : public osg::Referenced
         Cursor             _currentCursor;
         Cursor             _nullCursor;
         Cursor             _defaultCursor;
+        unsigned int       _frameCount;
 #endif
         bool               _decorations;
         bool               _useCursorFlag;
         std::string        _windowName;
-        unsigned int       _frameCount;
         bool               _mayFullScreen;
         bool               _isFullScreen;
         bool               _bindInputRectangleToWindowSize;