Finished adding restoreConsole

git-svn-id: https://svn.r-project.org/R/branches/djm-restoreConsole@36508 00db46b3-68df-0310-9c12-caf00c1e9a41
wch · Nov 26, 2005 · fcb0884 · fcb0884
1 parent c73a54b
commit fcb0884
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/library/grDevices/man/windows/windows.Rd b/src/library/grDevices/man/windows/windows.Rd
@@ -155,11 +155,13 @@ win.print(width = 7, height = 7, pointsize = 12, printer = "", restoreConsole =
   multiple plots is to use a parametrized \code{filename} as in the example.
 
   The \code{restoreConsole} argument is a temporary fix for a problem
-  in the current implementation of \code{win.metafile}, and is likely
-  to be removed in an upcoming release.  If set to \code{FALSE}, the 
-  console will not be repainted and will not receive the focus after the 
-  \code{win.metafile} call.  This should only be used in cases where
-  some other interface (e.g. a menu-driven one) is handling user input.
+  in the current implementation of several Windows graphics devices,
+  and is likely to be removed in an upcoming release.  If set to
+  \code{FALSE}, the console will not be repainted and will not receive
+  the focus after the new device is opened.  This should only be used
+  in cases where some other interface (e.g. a menu-driven one) is
+  handling user input, as it may leave the console with an incomplete
+  display.  
 }
 
 \value{

diff --git a/src/library/grDevices/src/devWindows.c b/src/library/grDevices/src/devWindows.c
@@ -55,7 +55,7 @@ Rboolean GADeviceDriver(NewDevDesc *dd, char *display, double width,
 			double height, double pointsize,
 			Rboolean recording, int resize, int bg, int canvas,
 			double gamma, int xpos, int ypos, Rboolean buffered,
-			SEXP psenv);
+			SEXP psenv, Rboolean restoreConsole);
 
 
 /* a colour used to represent the background on png if transparent
@@ -2709,6 +2709,7 @@ SEXP savePlot(SEXP args)
     char *fn, *tp, display[550];
     int device;
     NewDevDesc* dd;
+    Rboolean restoreConsole;
 
     args = CDR(args); /* skip entry point name */
     device = asInteger(CAR(args));