From: kgv <kgv@opencascade.com>
Date: Fri, 30 Nov 2012 12:01:48 +0000 (+0400)
Subject: 0023241: DRAWEXE crash on startup in Mac OS X
X-Git-Tag: V6_6_0_beta~203
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=4ad91217b5046e28b74e9ce4bbf8de520ebcfa8e;p=occt-copy.git

0023241: DRAWEXE crash on startup in Mac OS X

Fixing problem with Draw starting
Added problem description into the sources.
Cosmetic fix. Replaced tabs with spaces.
---

diff --git a/src/Draw/Draw_Window.cxx b/src/Draw/Draw_Window.cxx
index 03a6a78c89..c3d778abf1 100755
--- a/src/Draw/Draw_Window.cxx
+++ b/src/Draw/Draw_Window.cxx
@@ -1065,7 +1065,11 @@ Standard_Boolean Init_Appli()
   Tk_GeometryRequest(mainWindow, 200, 200);
 
   if (Draw_WindowDisplay == NULL) {
-    Draw_WindowDisplay = Tk_Display(mainWindow);
+    Draw_WindowDisplay = XOpenDisplay(NULL);
+    // Replaced Tk_Display(mainWindow) with XOpenDisplay; On Mac OS X Tk_Display
+    // returns a pointer to Display structure defined in system Tcl/Tk libraries.
+    // This structure differs from structure defined in X11 library and
+    // this caused DRAWEXE crash on startup.
   }
   if (Draw_WindowDisplay == NULL) {
     cout << "Cannot open display : "<<XDisplayName(NULL)<<endl;