The R Project SVN – R – Diff – /trunk/src/gnuwin32/pager.c

 static void pagerstayontop(control m)
+{
     control c = getdata(m);
-    if (ischecked(m)) {
-	uncheck(m);
-    	BringToTop(c, 0);
+    BringToTop(c, 2);
-    } else {
-	check(m);
-    	BringToTop(c, 1);
-    }
+}
 static void pagerconsole(control m)
+{
     show(RConsole);
         disable(p->mpaste);
         disable(p->mpoppaste);
+    }
     if (ismdi())
     	disable(PagerPopup[4].m);
-    else
+    else {
     	enable(PagerPopup[4].m);
+    	if (isTopmost(c))
+    	    check(PagerPopup[4].m);
+    	else
+    	    uncheck(PagerPopup[4].m);
+    }
+}
 #define MCHECK(a) if (!(a)) {freeConsoleData(p);del(c);return NULL;}
 RECT *RgetMDIsize(); /* in rui.c */
     setdata(m, c);
     setdata(p->mpopcopy = PagerPopup[0].m, c);
     setdata(p->mpoppaste = PagerPopup[1].m, c);
     setdata(PagerPopup[2].m, c);
     setdata(PagerPopup[4].m, c);
+    setdata(PagerPopup[6].m, c);
     MCHECK(m = newmenubar(pagermenuact));
     setdata(m, c);
     MCHECK(newmenu("File"));
     MCHECK(m = newmenuitem("Print...", 0, pagerprint));
     setdata(m, c);

The R Project SVN R