From b59e3fe6eccd7524fee15a01b2b955c232b6cdb1 Mon Sep 17 00:00:00 2001
From: frohlich <frohlich>
Date: Wed, 30 May 2007 13:15:14 +0000
Subject: [PATCH] Modified Files: 	src/GUI/dialog.cxx src/GUI/menubar.cxx
 	src/Include/config.h-msvc8 src/Main/fg_os_osgviewer.cxx: 	Olaf
 Flebbe: build fixes for osgviewer on win32.

---
 src/GUI/dialog.cxx           | 2 +-
 src/GUI/menubar.cxx          | 2 +-
 src/Include/config.h-msvc8   | 5 ++++-
 src/Main/fg_os_osgviewer.cxx | 5 +++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 3dba907c3..3303b90aa 100644
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -748,7 +748,7 @@ FGDialog::setupObject (puObject * object, SGPropertyNode * props)
 
         for (unsigned int i = 0; i < bindings.size(); i++) {
             unsigned int j = 0;
-            SGPropertyNode *binding;
+            SGPropertyNode_ptr binding;
             while (dest->getChild("binding", j))
                 j++;
 
diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index da905ee25..51ce861ea 100644
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -188,7 +188,7 @@ FGMenuBar::make_menu (SGPropertyNode * node)
 
         for (unsigned int k = 0; k < bindings.size(); k++) {
             unsigned int m = 0;
-            SGPropertyNode *binding;
+            SGPropertyNode_ptr binding;
             while (dest->getChild("binding", m))
                 m++;
 
diff --git a/src/Include/config.h-msvc8 b/src/Include/config.h-msvc8
index d30ede6a9..4a719d7e1 100755
--- a/src/Include/config.h-msvc8
+++ b/src/Include/config.h-msvc8
@@ -1,5 +1,8 @@
 
-/* Special single config.h for MSVC6 build - Geoff McLane - 23 July, 2003  */
+/* Special single config.h for MSVC8 build  */
+
+#define ENABLE_OSGVIEWER
+#define PU_USE_NATIVE 
 
 /* Define to enable plib joystick support */
 #ifndef  ENABLE_PLIB_JOYSTICK
diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx
index 7cde2a83d..d33da03b6 100644
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Main/fg_os_osgviewer.cxx
@@ -118,6 +118,11 @@ void fgOSOpenWindow(int w, int h, int bpp,
 	traits->windowDecoration = true;
         traits->width = w;
         traits->height = h;
+#ifdef WIN32
+	// Ugly Hack, why does CW_USEDEFAULT works like phase of the moon?
+	traits->x = 100;
+	traits->y = 100;
+#endif
         traits->supportsResize = true;
     }
 
-- 
2.39.5