From 5f02e63693f7b32055e73fd7ebbfc91dabff68bd Mon Sep 17 00:00:00 2001
From: kintel <kintel@b57f626f-c46c-0410-a088-ec61d464b74c>
Date: Sat, 3 Apr 2010 03:05:33 +0000
Subject: MDI fix and Mac environment for qcodeedit

git-svn-id: http://svn.clifford.at/openscad/trunk@506 b57f626f-c46c-0410-a088-ec61d464b74c

diff --git a/mjau.gdb b/mjau.gdb
index 7119d8d..6d749f1 100644
--- a/mjau.gdb
+++ b/mjau.gdb
@@ -1 +1 @@
-set environment DYLD_LIBRARY_PATH=/Users/kintel/code/metalab/checkout/OpenSCAD/OpenCSG-1.2.0/lib
\ No newline at end of file
+set environment DYLD_LIBRARY_PATH=/Users/kintel/code/metalab/checkout/OpenSCAD/OpenCSG-1.3.0/lib:/Users/kintel/code/metalab/checkout/OpenSCAD/qcodeedit-2.2.3/install/lib
\ No newline at end of file
diff --git a/setenv_mjau.sh b/setenv_mjau.sh
index 978d73e..ed466f7 100644
--- a/setenv_mjau.sh
+++ b/setenv_mjau.sh
@@ -1,3 +1,4 @@
 export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
 export CGALDIR=$PWD/../install/CGAL-3.6
+export QCODEEDITDIR=$PWD/../qcodeedit-2.2.3/install
 export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib:$QCODEEDITDIR/lib
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 816f897..b9ce5c7 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -412,7 +412,12 @@ void
 MainWindow::openFile(const QString &new_filename)
 {
 #ifdef ENABLE_MDI
+#ifdef _QCODE_EDIT_
+	if (this->editor->document()->lines() > 1 ||
+			!this->editor->document()->text(true, false).trimmed().isEmpty()) {
+#else
 	if (!editor->toPlainText().isEmpty()) {
+#endif
 		new MainWindow(new_filename);
 		clearCurrentOutput();
 		return;
-- 
cgit v0.10.1