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.

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 3dba907c3220c735980349892ec7feed762ed7c1..3303b90aa84dedbbaf1e6f98e766205ace8c7fd2 100644 (file)
--- 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 da905ee25647b0afd7229a27a1a0ad39d11021b2..51ce861ea7a2276d4160e3b8b3eb2bea2ac62c7d 100644 (file)
--- 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 d30ede6a9e6e5f84ed6bd7fdbd34fa4a0a1a84f7..4a719d7e191ec167bd9fb906bf3a75721988ba95 100755 (executable)
--- 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 7cde2a83d01473697d5f81c5f4a02a08c35899cb..d33da03b6a5a3d5a32383f077c75bc5c06be28b1 100644 (file)
--- 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;
     }