From 7b30f11858ee843565db10a0caea08e0ffa81570 Mon Sep 17 00:00:00 2001
From: Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
Date: Mon, 28 Feb 2011 13:37:19 +0000
Subject: [PATCH] togl 1.7

---
 ng/Makefile.am | 2 +-
 ng/drawing.tcl | 5 +++--
 ng/ngpkg.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ng/Makefile.am b/ng/Makefile.am
index 246a788b..46ba7df1 100644
--- a/ng/Makefile.am
+++ b/ng/Makefile.am
@@ -13,7 +13,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
 	$(top_builddir)/libsrc/gprim/libgprim.la \
 	$(top_builddir)/libsrc/linalg/libla.la \
 	$(top_builddir)/libsrc/general/libgen.la \
-	-L$(TK_BIN_DIR)/Togl2.0 $(TOGLLIBDIR) -lTogl2.0 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS)
+	-L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS)
 #
 #	$(top_builddir)/libsrc/occ/liboccvis.la 
 #	$(top_builddir)/libsrc/occ/libocc.la 
diff --git a/ng/drawing.tcl b/ng/drawing.tcl
index 46d1f0a7..0c780666 100644
--- a/ng/drawing.tcl
+++ b/ng/drawing.tcl
@@ -9,9 +9,10 @@ set oldmousey 0
 # use this one for Togl 2.0
 
 # if { 1 } {
+# if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init  -display draw -reshape reshape  }] } {    
 
-# if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init  -display draw -reshape reshape  }] } {
-if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init  -display draw -reshape reshape  }] } {    puts "no OpenGL" 
+if {[catch {togl .ndraw -width 400 -height 300  -rgba true -double true -depth true -privatecmap false -stereo false -indirect true }] } {
+    puts "no OpenGL" 
 } {
     #
     pack .ndraw -expand true -fill both -padx 10 -pady 10
diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp
index a7a0a73c..5efe882c 100644
--- a/ng/ngpkg.cpp
+++ b/ng/ngpkg.cpp
@@ -26,8 +26,8 @@ The interface between the GUI and the netgen library
 
 
 // to be sure to include the 'right' togl-version
-// #include "togl_1_7.h"
-#include "togl_2_0.h"
+#include "togl_1_7.h"
+// #include "togl_2_0.h"
 
 extern bool nodisplay;