The following commit has been merged in the patch/no_mac branch:
commit ada5b8295084987425c05c1126e42e2797ceb4e7
Merge: 3e7074383622bf4c712a9381559fc9df48ff3c76
4896c42db17a526df4a8fa382826c3f16231acab
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Wed Jan 11 12:06:13 2012 +0100
Merge commit 'refs/top-bases/patch/no_mac' into patch/no_mac
diff --combined geogebra/gui/app/GeoGebraFrame.java
index 4ee3b7a,bc5fbe0..2c8f7df
--- a/geogebra/gui/app/GeoGebraFrame.java
+++ b/geogebra/gui/app/GeoGebraFrame.java
@@@ -255,6 -255,16 +255,6 @@@ public class GeoGebraFrame extends JFra
* MacOS X specific initing. Note: this method can only be run on a Mac!
*/
public static void initMacSpecifics() {
- try {
- // init mac application listener
- MacApplicationListener.initMacApplicationListener();
-
- // mac menu bar
- //
System.setProperty("com.apple.macos.useScreenMenuBar", "true");
- System.setProperty("apple.laf.useScreenMenuBar",
"true");
- } catch (Exception e) {
- Application.debug(e + "");
- }
}
public static synchronized GeoGebraFrame createNewWindow(
@@@ -391,7 -401,12 +391,12 @@@
this.app.getGuiManager().initFileChooser();
// init CAS
- this.app.getKernel().getGeoGebraCAS();
+ // init CAS
+ // avoid hanging animation,
+ // see http://www.geogebra.org/trac/ticket/1565
+ // this.app.getKernel().getGeoGebraCAS();
+
geogebra.cas.mpreduce.CASmpreduce.getStaticInterpreter();
+
// init JLaTeXMath
Graphics2D g2d =
this.app.getEuclidianView().getTempGraphics2D();
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
