[rkward-cvs] SF.net SVN: rkward:[3149] trunk/rkward/rkward/main.cpp

[tfry at users.sourceforge.net]

Revision: 3149
          http://rkward.svn.sourceforge.net/rkward/?rev=3149&view=rev
Author:   tfry
Date:     2010-10-26 06:52:27 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
Reverting r3135 and r3136. They cause lockups on some systems.

Modified Paths:
--------------
    trunk/rkward/rkward/main.cpp

Modified: trunk/rkward/rkward/main.cpp
===================================================================
--- trunk/rkward/rkward/main.cpp	2010-10-25 16:41:07 UTC (rev 3148)
+++ trunk/rkward/rkward/main.cpp	2010-10-26 06:52:27 UTC (rev 3149)
@@ -69,11 +69,6 @@
 #	include <stdio.h>
 #	include <windows.h>
 #endif
-#ifdef Q_WS_X11
-#	include <X11/X.h>
-#	include <X11/Xlib.h>
-//#	include <X11/Intrinsic.h>
-#endif
 
 #include "debug.h"
 
@@ -95,10 +90,13 @@
 }
 
 int main(int argc, char *argv[]) {
-#ifdef Q_WS_X11
-	XInitThreads ();	// Makes library (gWidgetsRGtk2) work on X11.
-//	XtToolkitThreadInitialize ();
-#endif
+/* #ifdef Q_WS_X11
+	This (along with the proper includes, of course) makes library (gWidgetsRGtk2) work on X11 on some systems.
+	Unfortunately, on others, I causes lockups when plotting.
+
+	XInitThreads ();
+	XtToolkitThreadInitialize ();
+#endif */
 	options.add ("evaluate <Rcode>", ki18n ("After starting (and after loading the specified workspace, if applicable), evaluate the given R code."), 0);
 	options.add ("debug-level <level>", ki18n ("Verbosity of debug messages (0-5)"), "2");
 	options.add ("debug-flags <flags>", ki18n ("Mask for components to debug (see debug.h)"), "8191");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.