X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui.h;h=5b8478e95f2023cf21db372f9c358742017279ed;hb=5cad5aa7da2476ca8323a61f81dea59676dca085;hp=1e1b4362a9b43f2dcca6b9ca0e0e2aabc705eb49;hpb=17adffc5f9e900aa93b797ec7b682e81f6091197;p=flightgear.git

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index 1e1b4362a..5b8478e95 100644
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -29,19 +29,19 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include <plib/pu.h>
 
 #include <simgear/structure/exception.hxx>
 
 #define TR_HIRES_SNAP   1
 
-
+namespace osg
+{
+class GraphicsContext;
+}
 // gui.cxx
-extern void guiInit();
+extern void guiStartInit(osg::GraphicsContext*);
+extern bool guiFinishInit();
 extern void mkDialog(const char *txt);
 extern void guiErrorMessage(const char *txt);
 extern void guiErrorMessage(const char *txt, const sg_throwable &throwable);
@@ -55,60 +55,21 @@ extern fntTexFont *guiFntHandle;
 extern int gui_menu_on;
 
 // from gui_funcs.cxx
-extern void reInit(puObject *);
-extern void fgDumpSnapShotWrapper(puObject *);
+extern void reInit(void);
+extern void fgDumpSnapShotWrapper();
 #ifdef TR_HIRES_SNAP
-extern void fgHiResDumpWrapper(puObject *);
+extern void fgHiResDumpWrapper();
 extern void fgHiResDump();
 #endif
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-extern void printScreen(puObject *);
+extern void printScreen();
 #endif
-extern void helpCb(puObject *);
+extern void helpCb();
 
 typedef struct {
         const char *name;
-        void (*fn)(puObject *);
+        void (*fn)();
 } __fg_gui_fn_t;
 extern const __fg_gui_fn_t __fg_gui_fn[];
 
-// GLOBAL COMMON DIALOG BOX TEXT STRINGS
-//extern const char *gui_msg_OK;     // "OK"
-//extern const char *gui_msg_NO;     // "NO"
-//extern const char *gui_msg_YES;    // "YES"
-//extern const char *gui_msg_CANCEL; // "CANCEL"
-//extern const char *gui_msg_RESET;  // "RESET"
-
-// mouse.cxx
-extern void guiInitMouse(int width, int height);
-extern void maybeToggleMouse( void );
-extern void TurnCursorOn( void );
-extern void TurnCursorOff( void );
-
-// MACROS TO HELP KEEP PUI LIVE INTERFACE STACK IN SYNC
-// These insure that the mouse is active when dialog is shown
-// and try to the maintain the original mouse state when hidden
-// These will also repair any damage done to the Panel if active
-
-// Activate Dialog Box
-inline void FG_PUSH_PUI_DIALOG( puObject *X ) {
-    maybeToggleMouse(); 
-    puPushLiveInterface( (puInterface *)X ) ; 
-    X->reveal() ;
-}
-
-// Deactivate Dialog Box
-inline void FG_POP_PUI_DIALOG( puObject *X ) {
-    X->hide(); 
-    puPopLiveInterface(); 
-    maybeToggleMouse();
-}
-
-// Finalize Dialog Box Construction 
-inline void FG_FINALIZE_PUI_DIALOG( puObject *X ) {
-    ((puGroup *)X)->close();
-    X->hide();
-    puPopLiveInterface();
-}
-            
 #endif // _GUI_H_