fix error if tabbed_interface variable set in xschemrc
This commit is contained in:
parent
7d3c19441d
commit
659217148d
|
|
@ -2159,6 +2159,7 @@ int Tcl_AppInit(Tcl_Interp *inter)
|
|||
/* *AFTER* X initialization done */
|
||||
/* */
|
||||
if(has_x) {
|
||||
tclsetintvar("tctx::max_new_windows", MAX_NEW_WINDOWS);
|
||||
tcleval("pack_widgets; set_bindings .drw");
|
||||
}
|
||||
|
||||
|
|
@ -2226,7 +2227,6 @@ int Tcl_AppInit(Tcl_Interp *inter)
|
|||
load_schematic(1, fname, !do_netlist);
|
||||
}
|
||||
|
||||
tclsetintvar("tctx::max_new_windows", MAX_NEW_WINDOWS);
|
||||
|
||||
zoom_full(0, 0, 1, 0.97); /* Necessary to tell xschem the initial area to display */
|
||||
xctx->pending_fullzoom=1;
|
||||
|
|
|
|||
|
|
@ -4048,10 +4048,11 @@ proc pack_widgets { { topwin {} } } {
|
|||
pack $topwin.statusbar.8 -side left
|
||||
pack $topwin.statusbar.1 -side left -fill x
|
||||
pack $topwin.menubar -anchor n -side top -fill x
|
||||
pack $topwin.drw -anchor n -side top -fill both -expand true
|
||||
setup_tabbed_interface
|
||||
if {$tabbed_interface} {
|
||||
pack $topwin.tabs -fill x -side top -expand false -side top
|
||||
}
|
||||
pack $topwin.drw -anchor n -side top -fill both -expand true
|
||||
toolbar_show $topwin
|
||||
pack $topwin.statusbar -after $topwin.drw -anchor sw -fill x
|
||||
bind $topwin.statusbar.5 <Leave> "set cadgrid \[$topwin.statusbar.5 get\]; xschem set cadgrid \$cadgrid"
|
||||
|
|
@ -4569,7 +4570,6 @@ proc build_widgets { {topwin {} } } {
|
|||
|
||||
focus $topwin.drw
|
||||
if { $topwin == {} } {set rootwin .} else { set rootwin $topwin}
|
||||
setup_tabbed_interface
|
||||
wm title $rootwin "xschem - "
|
||||
wm iconname $rootwin "xschem - "
|
||||
$rootwin configure -background {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue