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

     Changes for R:
     sort out resize (confused screen and client coords)
     add printer and metafile handling
+    Remove assumption of current->dest being non-NULL
  */
 #include "internal.h"
 	prev = current->dest;
 	drawto(obj);
 	old = currentrgb();
 	setrgb(obj->bg);
 	fillrect(getrect(obj));
+	if (prev) {
-	setrgb(old);
+		setrgb(old);
-	drawto(prev);
+		drawto(prev);
+    	}
+}
 void draw(control obj)
+{
 	drawing prev;
 		return;
 	if ((obj->call == NULL) || (obj->call->redraw == NULL))
 		return;
 	prev = current->dest;
 	drawto(obj);
-	old = copydrawstate();
+	if (prev) old = copydrawstate();
 	moveto(pt(0,0));
 	obj->call->redraw(obj, getrect(obj));
+	if (prev) {
-	restoredrawstate(old);
+		restoredrawstate(old);
-	drawto(prev);
+		drawto(prev);
+    	}
+}
 void redraw(control obj)
+{
 	clear(obj);

The R Project SVN R