Revision: 75877 http://sourceforge.net/p/brlcad/code/75877 Author: starseeker Date: 2020-05-21 15:01:08 +0000 (Thu, 21 May 2020) Log Message: ----------- Merge changes from trunk through r75876
Modified Paths: -------------- brlcad/branches/bioh/src/libfb/if_tk.cpp Property Changed: ---------------- brlcad/branches/bioh/ Index: brlcad/branches/bioh =================================================================== --- brlcad/branches/bioh 2020-05-21 15:00:50 UTC (rev 75876) +++ brlcad/branches/bioh 2020-05-21 15:01:08 UTC (rev 75877) Property changes on: brlcad/branches/bioh ___________________________________________________________________ Modified: svn:mergeinfo ## -7,4 +7,4 ## /brlcad/branches/osg:62110-62113 /brlcad/branches/prep-cache:68236-68933 /brlcad/branches/tcltk86:68300-75257 -/brlcad/trunk:75720-75874 \ No newline at end of property +/brlcad/trunk:75720-75876 \ No newline at end of property Modified: brlcad/branches/bioh/src/libfb/if_tk.cpp =================================================================== --- brlcad/branches/bioh/src/libfb/if_tk.cpp 2020-05-21 15:00:50 UTC (rev 75876) +++ brlcad/branches/bioh/src/libfb/if_tk.cpp 2020-05-21 15:01:08 UTC (rev 75877) @@ -118,12 +118,12 @@ if (Tcl_Init(tki->fbinterp) == TCL_ERROR) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } if (Tcl_Eval(tki->fbinterp, "package require Tk") != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } tki->fbwin = Tk_MainWindow(tki->fbinterp); @@ -134,12 +134,12 @@ if (Tcl_Eval(tki->fbinterp, "wm resizable . 0 0") != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } if (Tcl_Eval(tki->fbinterp, "wm title . \"Frame buffer\"") != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } char frame_create_cmd[255] = {'\0'}; @@ -146,7 +146,7 @@ sprintf(frame_create_cmd, "pack [frame .fb -borderwidth 0 -highlightthickness 0 -height %d -width %d]", ifp->if_width, ifp->if_height); if (Tcl_Eval(tki->fbinterp, frame_create_cmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } char canvas_create_cmd[255] = {'\0'}; @@ -153,7 +153,7 @@ sprintf(canvas_create_cmd, "pack [canvas .fb.canvas -borderwidth 0 -highlightthickness 0 -insertborderwidth 0 -selectborderwidth 0 -height %d -width %d]", ifp->if_width, ifp->if_height); if (Tcl_Eval(tki->fbinterp, canvas_create_cmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } //const char canvas_pack_cmd[255] = "pack .fb_tk_canvas -fill both -expand true"; @@ -161,18 +161,18 @@ sprintf(image_create_cmd, "image create photo .fb.canvas.photo -height %d -width %d", ifp->if_width, ifp->if_height); if (Tcl_Eval(tki->fbinterp, image_create_cmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } if ((tki->fbphoto = Tk_FindPhoto(tki->fbinterp, ".fb.canvas.photo")) == NULL) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } const char place_image_cmd[255] = ".fb.canvas create image 0 0 -image .fb.canvas.photo -anchor nw"; if (Tcl_Eval(tki->fbinterp, place_image_cmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } char reportcolorcmd[255] = {'\0'}; @@ -191,17 +191,17 @@ const char *wmclosecmd = "wm protocol . WM_DELETE_WINDOW {set CloseWindow \"close\"}"; if (Tcl_Eval(tki->fbinterp, wmclosecmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } const char *bindclosecmd = "bind . <Button-3> {set CloseWindow \"close\"}"; if (Tcl_Eval(tki->fbinterp, bindclosecmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } if (Tcl_Eval(tki->fbinterp, reportcolorcmd) != TCL_OK) { Tcl_ExitThread(TCL_OK); - return TCL_THREAD_CREATE_RETURN; + TCL_THREAD_CREATE_RETURN; } // Clear out any events up to this point This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits