[education/rkward/kf5] rkward/rbackend: Adjust to hiding for R_checkActivityEx in R-devel (for R 4.5)

Thomas Friedrichsmeier null at kde.org
Tue Apr 22 13:00:59 BST 2025


Git commit ca17191f79d95eb6f8470326bf2311b557c2b066 by Thomas Friedrichsmeier.
Committed on 22/04/2025 at 12:00.
Pushed by tfry into branch 'kf5'.

Adjust to hiding for R_checkActivityEx in R-devel (for R 4.5)

M  +3    -3    rkward/rbackend/rkreventloop.cpp

https://invent.kde.org/education/rkward/-/commit/ca17191f79d95eb6f8470326bf2311b557c2b066

diff --git a/rkward/rbackend/rkreventloop.cpp b/rkward/rbackend/rkreventloop.cpp
index d815a4aa0..97fd6115a 100644
--- a/rkward/rbackend/rkreventloop.cpp
+++ b/rkward/rbackend/rkreventloop.cpp
@@ -25,9 +25,9 @@ static void processX11EventsWorker (void *) {
 #ifndef Q_OS_WIN
 	for (;;) {
 		fd_set *what;
-		what = R_checkActivityEx(R_wait_usec > 0 ? R_wait_usec : 50, 1, RK_doIntr);
-		R_runHandlers(R_InputHandlers, what);
-		if (what == NULL) break;
+		what = RFn::R_checkActivity(ROb(R_wait_usec) > 0 ? ROb(R_wait_usec) : 50, 1);
+		RFn::R_runHandlers(ROb(R_InputHandlers), what);
+		if (!what) break;
 	}
 	/* This seems to be needed to make Rcmdr react to events. Has this always been the case? It was commented out for a long time, without anybody noticing. */
 	R_PolledEvents ();


More information about the rkward-tracker mailing list