OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

Draw_Window - workaround broken Tk.framework installations in OS X SDKs

Browse Source
This commit is contained in:
kgv 2013-11-02 19:09:03 +04:00 committed by abv
parent 9293178ba0
commit 262bf46d18
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Draw/Draw_Window.cxx
View File

@ -135,15 +135,30 @@ defaultPrompt:
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <tk.h>
#if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
// use forward declaration for small subset of used Tk functions
// to workaround broken standard Tk framework installation within OS X SDKs
// which *HAS* X11 headers in Tk.framework but doesn't install them appropriately
#define _TK
typedef struct Tk_Window_* Tk_Window;
typedef const char* Tk_Uid;
extern "C" int Tk_Init (Tcl_Interp* interp);
extern "C" void Tk_MainLoop();
extern "C" Tk_Window Tk_MainWindow (Tcl_Interp* interp) ;
extern "C" Tk_Uid Tk_GetUid (const char* str);
extern "C" const char* Tk_SetAppName (Tk_Window tkwin, const char* name) ;
extern "C" void Tk_GeometryRequest (Tk_Window tkwin, int reqWidth, int reqHeight);
#else
#include <tk.h>
#endif
/* /*
* Global variables used by the main program: * Global variables used by the main program:
*/ */
static Tk_Window mainWindow; /* The main window for the application. If
* NULL then the application no longer
* exists. */
char *tcl_RcFileName = NULL; /* Name of a user-specific startup script char *tcl_RcFileName = NULL; /* Name of a user-specific startup script
* to source if the application is being run * to source if the application is being run
* interactively (e.g. "~/.wishrc"). Set * interactively (e.g. "~/.wishrc"). Set
@ -1092,9 +1107,8 @@ Standard_Boolean Init_Appli()
Tcl_StaticPackage(interp, "Tk", Tk_Init, (Tcl_PackageInitProc *) NULL); Tcl_StaticPackage(interp, "Tk", Tk_Init, (Tcl_PackageInitProc *) NULL);
mainWindow = Tk_Window aMainWindow = Tk_MainWindow(interp) ;
Tk_MainWindow(interp) ; if (aMainWindow == NULL) {
if (mainWindow == NULL) {
#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 5))) #if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 5)))
fprintf(stderr, "%s\n", Tcl_GetStringResult(interp)); fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
#else #else
@ -1102,11 +1116,13 @@ Standard_Boolean Init_Appli()
#endif #endif
exit(1); exit(1);
} }
Tk_Name(mainWindow) = #if defined(__APPLE__) && !defined(MACOSX_USE_GLX)
Tk_GetUid(Tk_SetAppName(mainWindow, Tk_SetAppName(aMainWindow, "Draw");
"Draw")) ; #else
Tk_Name(aMainWindow) = Tk_GetUid(Tk_SetAppName(aMainWindow, "Draw"));
#endif
Tk_GeometryRequest(mainWindow, 200, 200); Tk_GeometryRequest (aMainWindow, 200, 200);
#if !defined(__APPLE__) || defined(MACOSX_USE_GLX) #if !defined(__APPLE__) || defined(MACOSX_USE_GLX)
if (Draw_DisplayConnection.IsNull()) if (Draw_DisplayConnection.IsNull())
@ -1118,7 +1134,7 @@ Standard_Boolean Init_Appli()
catch (Standard_Failure) catch (Standard_Failure)
{ {
std::cout << "Cannot open display. Interpret commands in batch mode." << std::endl; std::cout << "Cannot open display. Interpret commands in batch mode." << std::endl;
return Standard_False; return Standard_False;
} }
} }
if (Draw_WindowDisplay == NULL) if (Draw_WindowDisplay == NULL)

1
src/DrawResources/DrawDefault
View File

@ -39,6 +39,7 @@ if { [file isdirectory $dir] } {
if { ${stationname} == "windows" } { if { ${stationname} == "windows" } {
wm iconbitmap . -default [file join $dir lamp.ico] wm iconbitmap . -default [file join $dir lamp.ico]
} }
wm title . Draw
} }
} else { } else {
puts "Warning: could not find DRAW directory" puts "Warning: could not find DRAW directory"