Changeset 388 for python/vendor/current/Modules/tkappinit.c

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Modules/tkappinit.c (modified) (3 diffs)

python/vendor/current/Modules/tkappinit.c

@@ -17 +17 @@
 #include <tk.h>
 
+#include "tkinter.h"
+
+#ifdef TKINTER_PROTECT_LOADTK
+/* See Tkapp_TkInit in _tkinter.c for the usage of tk_load_faile */
+static int tk_load_failed;
+#endif
+
 int
 Tcl_AppInit(Tcl_Interp *interp)
 {
-        Tk_Window main_window;
-        const char * _tkinter_skip_tk_init;
+    Tk_Window main_window;
+    const char *_tkinter_skip_tk_init;
+#ifdef TKINTER_PROTECT_LOADTK
+    const char *_tkinter_tk_failed;
+#endif
 
 #ifdef TK_AQUA
@@ -27 +37 @@
 #define MAX_PATH_LEN 1024
 #endif
-        char tclLibPath[MAX_PATH_LEN], tkLibPath[MAX_PATH_LEN];
-        Tcl_Obj*        pathPtr;
+    char tclLibPath[MAX_PATH_LEN], tkLibPath[MAX_PATH_LEN];
+    Tcl_Obj*            pathPtr;
 
-        /* pre- Tcl_Init code copied from tkMacOSXAppInit.c */
-        Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tcllibrary",
-        tclLibPath, MAX_PATH_LEN, 0);
+    /* pre- Tcl_Init code copied from tkMacOSXAppInit.c */
+    Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tcllibrary",
+    tclLibPath, MAX_PATH_LEN, 0);
 
-        if (tclLibPath[0] != '\0') {
-        Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
-                Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
-                Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
-        }
-        
-        if (tclLibPath[0] != '\0') {
-                Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
-                Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
-                Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
-        }
+    if (tclLibPath[0] != '\0') {
+    Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
+        Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
+        Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
+    }
+
+    if (tclLibPath[0] != '\0') {
+        Tcl_SetVar(interp, "tcl_library", tclLibPath, TCL_GLOBAL_ONLY);
+        Tcl_SetVar(interp, "tclDefaultLibrary", tclLibPath, TCL_GLOBAL_ONLY);
+        Tcl_SetVar(interp, "tcl_pkgPath", tclLibPath, TCL_GLOBAL_ONLY);
+    }
 #endif
-        if (Tcl_Init (interp) == TCL_ERROR)
-                return TCL_ERROR;
+    if (Tcl_Init (interp) == TCL_ERROR)
+        return TCL_ERROR;
 
 #ifdef TK_AQUA
-        /* pre- Tk_Init code copied from tkMacOSXAppInit.c */
-        Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tklibrary",
-            tkLibPath, MAX_PATH_LEN, 1);
+    /* pre- Tk_Init code copied from tkMacOSXAppInit.c */
+    Tk_MacOSXOpenBundleResources (interp, "com.tcltk.tklibrary",
+        tkLibPath, MAX_PATH_LEN, 1);
 
-        if (tclLibPath[0] != '\0') {
-                pathPtr = Tcl_NewStringObj(tclLibPath, -1);
-        } else {
-                Tcl_Obj *pathPtr = TclGetLibraryPath();
-        }
+    if (tclLibPath[0] != '\0') {
+        pathPtr = Tcl_NewStringObj(tclLibPath, -1);
+    } else {
+        Tcl_Obj *pathPtr = TclGetLibraryPath();
+    }
 
-        if (tkLibPath[0] != '\0') {
-                Tcl_Obj *objPtr;
+    if (tkLibPath[0] != '\0') {
+        Tcl_Obj *objPtr;
 
-                Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY);
-                objPtr = Tcl_NewStringObj(tkLibPath, -1);
-                Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
-        }
+        Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY);
+        objPtr = Tcl_NewStringObj(tkLibPath, -1);
+        Tcl_ListObjAppendElement(NULL, pathPtr, objPtr);
+    }
 
-        TclSetLibraryPath(pathPtr);
+    TclSetLibraryPath(pathPtr);
 #endif
 
 #ifdef WITH_XXX
-                /* Initialize modules that don't require Tk */
+        /* Initialize modules that don't require Tk */
 #endif
 
-        _tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY);
-        if (_tkinter_skip_tk_init != NULL && strcmp(_tkinter_skip_tk_init, "1") == 0) {
-                return TCL_OK;
-        }
-        if (Tk_Init(interp) == TCL_ERROR)
-                return TCL_ERROR;
+    _tkinter_skip_tk_init =     Tcl_GetVar(interp,
+                    "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY);
+    if (_tkinter_skip_tk_init != NULL &&
+                    strcmp(_tkinter_skip_tk_init, "1") == 0) {
+        return TCL_OK;
+    }
 
-        main_window = Tk_MainWindow(interp);
+#ifdef TKINTER_PROTECT_LOADTK
+    _tkinter_tk_failed = Tcl_GetVar(interp,
+                    "_tkinter_tk_failed", TCL_GLOBAL_ONLY);
+
+    if (tk_load_failed || (
+                            _tkinter_tk_failed != NULL &&
+                            strcmp(_tkinter_tk_failed, "1") == 0)) {
+        Tcl_SetResult(interp, TKINTER_LOADTK_ERRMSG, TCL_STATIC);
+        return TCL_ERROR;
+    }
+#endif
+
+    if (Tk_Init(interp) == TCL_ERROR) {
+#ifdef TKINTER_PROTECT_LOADTK
+        tk_load_failed = 1;
+        Tcl_SetVar(interp, "_tkinter_tk_failed", "1", TCL_GLOBAL_ONLY);
+#endif
+        return TCL_ERROR;
+    }
+
+    main_window = Tk_MainWindow(interp);
 
 #ifdef TK_AQUA
-        TkMacOSXInitAppleEvents(interp);
-        TkMacOSXInitMenus(interp);
+    TkMacOSXInitAppleEvents(interp);
+    TkMacOSXInitMenus(interp);
 #endif
-    
+
 #ifdef WITH_MOREBUTTONS
-        {
-                extern Tcl_CmdProc studButtonCmd;
-                extern Tcl_CmdProc triButtonCmd;
+    {
+        extern Tcl_CmdProc studButtonCmd;
+        extern Tcl_CmdProc triButtonCmd;
 
-                Tcl_CreateCommand(interp, "studbutton", studButtonCmd,
-                                  (ClientData) main_window, NULL);
-                Tcl_CreateCommand(interp, "tributton", triButtonCmd,
-                                  (ClientData) main_window, NULL);
-        }
+        Tcl_CreateCommand(interp, "studbutton", studButtonCmd,
+                          (ClientData) main_window, NULL);
+        Tcl_CreateCommand(interp, "tributton", triButtonCmd,
+                          (ClientData) main_window, NULL);
+    }
 #endif
 
 #ifdef WITH_PIL /* 0.2b5 and later -- not yet released as of May 14 */
-        {
-                extern void TkImaging_Init(Tcl_Interp *);
-                TkImaging_Init(interp);
-                /* XXX TkImaging_Init() doesn't have the right return type */
-                /*Tcl_StaticPackage(interp, "Imaging", TkImaging_Init, NULL);*/
-        }
+    {
+        extern void TkImaging_Init(Tcl_Interp *);
+        TkImaging_Init(interp);
+        /* XXX TkImaging_Init() doesn't have the right return type */
+        /*Tcl_StaticPackage(interp, "Imaging", TkImaging_Init, NULL);*/
+    }
 #endif
 
 #ifdef WITH_PIL_OLD /* 0.2b4 and earlier */
-        {
-                extern void TkImaging_Init(void);
-                /* XXX TkImaging_Init() doesn't have the right prototype */
-                /*Tcl_StaticPackage(interp, "Imaging", TkImaging_Init, NULL);*/
-        }
+    {
+        extern void TkImaging_Init(void);
+        /* XXX TkImaging_Init() doesn't have the right prototype */
+        /*Tcl_StaticPackage(interp, "Imaging", TkImaging_Init, NULL);*/
+    }
 #endif
 
 #ifdef WITH_TIX
-        {
-                extern int Tix_Init(Tcl_Interp *interp);
-                extern int Tix_SafeInit(Tcl_Interp *interp);
-                Tcl_StaticPackage(NULL, "Tix", Tix_Init, Tix_SafeInit);
-        }
+    {
+        extern int Tix_Init(Tcl_Interp *interp);
+        extern int Tix_SafeInit(Tcl_Interp *interp);
+        Tcl_StaticPackage(NULL, "Tix", Tix_Init, Tix_SafeInit);
+    }
 #endif
 
 #ifdef WITH_BLT
-        {
-                extern int Blt_Init(Tcl_Interp *);
-                extern int Blt_SafeInit(Tcl_Interp *);
-                Tcl_StaticPackage(NULL, "Blt", Blt_Init, Blt_SafeInit);
-        }
+    {
+        extern int Blt_Init(Tcl_Interp *);
+        extern int Blt_SafeInit(Tcl_Interp *);
+        Tcl_StaticPackage(NULL, "Blt", Blt_Init, Blt_SafeInit);
+    }
 #endif
 
 #ifdef WITH_TOGL
-        {
-                /* XXX I've heard rumors that this doesn't work */
-                extern int Togl_Init(Tcl_Interp *);
-                /* XXX Is there no Togl_SafeInit? */
-                Tcl_StaticPackage(NULL, "Togl", Togl_Init, NULL);
-        }
+    {
+        /* XXX I've heard rumors that this doesn't work */
+        extern int Togl_Init(Tcl_Interp *);
+        /* XXX Is there no Togl_SafeInit? */
+        Tcl_StaticPackage(NULL, "Togl", Togl_Init, NULL);
+    }
 #endif
 
@@ -146 +176 @@
 
 #endif
-        return TCL_OK;
+    return TCL_OK;
 }