[rkward-cvs] SF.net SVN: rkward-code:[4691]

[tfry at users.sf.net]

Revision: 4691
          http://sourceforge.net/p/rkward/code/4691
Author:   tfry
Date:     2013-04-11 17:50:49 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Sigh. Ubuntu lucid still has R 2.10.0. So try harder to provide backwards compatibility as much as possible.

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

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:46:33 UTC (rev 4690)
+++ branches/development_branches/rkward_graphpics_device/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp	2013-04-11 17:50:49 UTC (rev 4691)
@@ -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;

Modified: trunk/rkward/rkward/rbackend/FindR.cmake
===================================================================
--- trunk/rkward/rkward/rbackend/FindR.cmake	2013-04-11 17:46:33 UTC (rev 4690)
+++ trunk/rkward/rkward/rbackend/FindR.cmake	2013-04-11 17:50:49 UTC (rev 4691)
@@ -18,8 +18,8 @@
 	OUTPUT_VARIABLE R_ARCH)
 MESSAGE (STATUS "R architecture is ${R_ARCH}")
 
-# check R version. Currently min R 2.12.0.
-SET (R_MIN_VERSION "2.12.0")
+# check R version.
+SET (R_MIN_VERSION "2.8.0")
 MESSAGE (STATUS "Checking R version")
 EXECUTE_PROCESS(
 	COMMAND ${R_EXECUTABLE} "--slave" "--no-save" "-e" "cat (paste(R.version$major, R.version$minor, sep='.'))"