- remove unused puObject args in gui fgcommands

- remove no longer used PU macros

diff --git a/src/GUI/gui.h b/src/GUI/gui.h
index 4897b0ed929130e021e3a145ef4526b702f3f061..7548ed5a96deea6b95e98795b685b2b9f87b2235 100644 (file)
--- a/src/GUI/gui.h
+++ b/src/GUI/gui.h
@@ -56,20 +56,20 @@ 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[];
 
@@ -79,30 +79,4 @@ 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_

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 7c4a5171cd8679c68054d4ec8a3c95c844a8c1a6..dae131cde9eb1aefca8a3cc2543e09338b20c110 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -197,7 +197,7 @@ ____________________________________________________________________*/
 // on Sunday 3rd of December
 
 
-void helpCb (puObject *)
+void helpCb ()
 {
     string command;
        
@@ -489,7 +489,7 @@ GLubyte *hiResScreenCapture( int multiplier )
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
 // win32 print screen function
-void printScreen ( puObject *obj ) {
+void printScreen () {
     bool show_pu_cursor = false;
     TurnCursorOff();
     if ( !puCursorIsHidden() ) {
@@ -511,12 +511,12 @@ void printScreen ( puObject *obj ) {
 #endif // #ifdef WIN32
 
 
-void fgDumpSnapShotWrapper ( puObject *obj ) {
+void fgDumpSnapShotWrapper () {
     fgDumpSnapShot();
 }
 
 
-void fgHiResDumpWrapper ( puObject *obj ) {
+void fgHiResDumpWrapper () {
     fgHiResDump();
 }
 

diff --git a/src/GUI/gui_local.cxx b/src/GUI/gui_local.cxx
index b79d8e43c653d1b2b9c8b981e2c55348ebd69c7e..8cf34583720bf0f450824f214ce13d7bf849a6fe 100644 (file)
--- a/src/GUI/gui_local.cxx
+++ b/src/GUI/gui_local.cxx
@@ -24,7 +24,6 @@
 // stashed trackball(_quat0, 0.0, 0.0, 0.0, 0.0);
 static float _quat0[4];
 
-float lastGuiQuat[4];
 float curGuiQuat[4];
 
 // To apply our mouse rotation quat to VIEW
@@ -46,7 +45,7 @@ void initMouseQuat(void) {
 }
 
 
-void reInit(puObject *cb)
+void reInit(void)
 {
     Quat0();
 

diff --git a/src/GUI/gui_local.hxx b/src/GUI/gui_local.hxx
index ef329ccaf9902d50ee4273a9ae4ff00ca187741e..5925175c4f5d66d2f3fdc4edf58b9f9d6f9842ab 100644 (file)
--- a/src/GUI/gui_local.hxx
+++ b/src/GUI/gui_local.hxx
@@ -23,12 +23,10 @@ typedef enum {
 extern MouseMode mouse_mode;
 extern int gui_menu_on;
 
-extern float lastGuiQuat[4];
 extern float curGuiQuat[4];
 extern float GuiQuat_mat[4][4];
 
 extern void initMouseQuat( void );
 extern void Quat0( void );
 
-class puObject;
-extern void reInit(puObject *cb);
+extern void reInit(void);

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index f7955dc159ebc90e6fc3280bb2cd44bc3290cdfd..fd034c1969db1e0c15f3ce620c1e2a59b762d92a 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -26,39 +26,39 @@
 // user-configured dialogs and new commands where necessary.
 ////////////////////////////////////////////////////////////////////////
 
-extern void reInit (puObject *);
+extern void reInit (void);
 static bool
 do_reinit_dialog (const SGPropertyNode * arg)
 {
-    reInit(0);
+    reInit();
     return true;
 }
 
 #if defined(TR_HIRES_SNAP)
-extern void dumpHiResSnapShot (puObject *);
+extern void dumpHiResSnapShot ();
 static bool
 do_hires_snapshot_dialog (const SGPropertyNode * arg)
 {
-    dumpHiResSnapShot(0);
+    dumpHiResSnapShot();
     return true;
 }
 #endif // TR_HIRES_SNAP
 
 #if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
-extern void printScreen (puObject *);
+extern void printScreen ();
 static bool
 do_print_dialog (const SGPropertyNode * arg)
 {
-    printScreen(0);
+    printScreen();
     return true;
 }
 #endif
 
-extern void helpCb (puObject *);
+extern void helpCb ();
 static bool
 do_help_dialog (const SGPropertyNode * arg)
 {
-    helpCb(0);
+    helpCb();
     return true;
 }