[rkward-cvs] SF.net SVN: rkward-code:[4692] branches/development_branches/ rkward_graphpics_device/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup .cpp

[tfry at users.sf.net]

Revision: 4692
          http://sourceforge.net/p/rkward/code/4692
Author:   tfry
Date:     2013-04-11 17:52:24 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Whoops. Part of r4691 went to the wrong branch.

Revision Links:
--------------
    http://sourceforge.net/p/rkward/code/4691

Modified Paths:
--------------
    branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp

Modified: branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp
===================================================================
--- branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp	2013-04-11 17:50:49 UTC (rev 4691)
+++ branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp	2013-04-11 17:52:24 UTC (rev 4692)
@@ -164,7 +164,6 @@
 	dev->haveLocator = 2;
 #endif
 
-#if R_VERSION >= R_Version (2, 12, 0)
 	/*
 	* Mouse events
 	*/
@@ -175,8 +174,6 @@
 
 	// gettingEvent; This is set while getGraphicsEvent is actively
 	// looking for events
-//	dev->eventHelper = ...
-#endif
 
 	/*
 	* Device functions
@@ -196,10 +193,9 @@
 	dev->rect = RKD_Rect;
 	dev->size = RKD_Size;
 	// dev->onexit = RKD_OnExit; Called on user interrupts. NULL is OK.
-#if R_VERSION >= R_Version (2, 11, 0)
+	// dev->getEvent = SEXP (*getEvent)(SEXP, const char *);
 	dev->raster = RKD_Raster;
 	dev->cap = RKD_Capture;
-#endif
 	dev->newFrameConfirm = RKD_NewFrameConfirm;
 
 	return true;