# include <windows.h>
#endif
-#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;
// 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;
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...
initMouseQuat();
// Set up our Dialog Boxes
- ConfirmExitDialogInit();
fgPresetInit();
-
-#ifdef FG_NETWORK_OLK
- NewNetIdInit();
- NewNetFGDInit();
-#endif
-
- mkDialogInit();
}