[rkward-cvs] SF.net SVN: rkward-code:[4693] trunk/rkward/rkward/rbackend/rkwarddevice

[tfry at users.sf.net]

Revision: 4693
          http://sourceforge.net/p/rkward/code/4693
Author:   tfry
Date:     2013-04-11 17:56:27 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Re-commit to the right branch.

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp

Property Changed:
----------------
    trunk/rkward/rkward/rbackend/rkwarddevice/

Index: trunk/rkward/rkward/rbackend/rkwarddevice
===================================================================
--- trunk/rkward/rkward/rbackend/rkwarddevice	2013-04-11 17:52:24 UTC (rev 4692)
+++ trunk/rkward/rkward/rbackend/rkwarddevice	2013-04-11 17:56:27 UTC (rev 4693)

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