Fix line endings

[flightgear.git] / src / GUI / gui.cxx

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index e853760b1b164e2890ecf328d209385fbd49cb6c..fbc5e902aa80f385ce71d32edd650ddb44a0356a 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -34,30 +34,22 @@
 #  include <windows.h>
 #endif
 
-#include <simgear/misc/props.hxx>
-#include <simgear/misc/props_io.hxx>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <plib/pu.h>
 
 #include <Include/general.hxx>
+#include <Main/main.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 
 #include "gui.h"
 #include "gui_local.hxx"
-#include "net_dlg.hxx"
 #include "preset_dlg.hxx"
-
-
-// main.cxx hack, should come from an include someplace
-extern void fgInitVisuals( void );
-extern void fgRenderFrame( void );
-
-extern void initDialog (void);
-extern void mkDialogInit (void);
-extern void ConfirmExitDialogInit(void);
+#include "layout.hxx"
 
 
 puFont guiFnt = 0;
@@ -75,10 +67,8 @@ void guiInit()
 
     // Initialize PUI
     puInit();
-    puSetDefaultStyle         ( PUSTYLE_SMALL_BEVELLED ); //PUSTYLE_DEFAULT
-    puSetDefaultColourScheme  (0.8, 0.8, 0.9, 0.8);
-
-    initDialog();
+    puSetDefaultStyle         ( PUSTYLE_SMALL_SHADED ); //PUSTYLE_DEFAULT
+    puSetDefaultColourScheme  (0.8, 0.8, 0.9, 1);
 
     // Next check home directory
     SGPath fntpath;
@@ -98,6 +88,8 @@ void guiInit()
     puFont GuiFont ( guiFntHandle, 15 ) ;
     puSetDefaultFonts( GuiFont, GuiFont ) ;
     guiFnt = puGetDefaultLabelFont();
+
+    LayoutWidget::setDefaultFont(&GuiFont, 15);
   
     if (!fgHasNode("/sim/startup/mouse-pointer")) {
         // no preference specified for mouse pointer, attempt to autodetect...
@@ -126,13 +118,5 @@ void guiInit()
        initMouseQuat();
 
     // Set up our Dialog Boxes
-    ConfirmExitDialogInit();
     fgPresetInit();
-       
-#ifdef FG_NETWORK_OLK
-    NewNetIdInit();
-    NewNetFGDInit();
-#endif
-
-    mkDialogInit();
 }