Tk Source Code

Check-in [f656afba]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix merge conflict in tk.tcl from services branch merge
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-6-branch
Files: files | file ages | folders
SHA3-256: f656afba8d876191abf8b42521f408104a95d3ed02a05c93c1f141e5580158af
User & Date: kevin_walzer 2019-06-16 02:28:34
Context
2019-06-19
09:35
Re-generate unix/configure with autoconf 2.59, just as in core-8-6-10-rc branch, as it should be. check-in: ab38ffa0 user: jan.nijtmans tags: core-8-6-branch
2019-06-17
19:21
Bump version numbers for Tk 8.6.10 release. check-in: 14fafdd6 user: dgp tags: core-8-6-10-rc
18:56
Merge 8.6. Purge end-of-line spaces check-in: a27f80a5 user: jan.nijtmans tags: trunk
2019-06-16
14:57
merge 8.6 main branch check-in: 1736f843 user: dkf tags: bug6e8afe516d, tip-532
02:28
Fix merge conflict in tk.tcl from services branch merge check-in: f656afba user: kevin_walzer tags: core-8-6-branch
2019-06-15
20:42
Define offsetof() macro for (very rare) platforms which don't have it. Don't punish developers for using offsetof() in extensions, forgetting that ... check-in: 64dace1d user: jan.nijtmans tags: core-8-6-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to library/tk.tcl.

672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
	if {$length > $maxlen} {
	    set maxlen $length
	}
    }
    return $maxlen
}
 
# For now, turn off the custom mdef proc for the mac:

if {[tk windowingsystem] eq "aqua"} {
    namespace eval ::tk::mac {
	set useCustomMDEF 0
    }
}

#register to send data to macOS Services
if {[tk windowingsystem] eq "aqua"} {
proc ::tk::RegisterServiceWidget {w} {
    ::tk::mac::registerServiceWidget $w
  }
}


# Run the Ttk themed widget set initialization
if {$::ttk::library ne ""} {
    uplevel \#0 [list source $::ttk::library/ttk.tcl]
}
 
# Local Variables:
# mode: tcl
# fill-column: 78
# End:






|













<










672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692

693
694
695
696
697
698
699
700
701
702
	if {$length > $maxlen} {
	    set maxlen $length
	}
    }
    return $maxlen
}
 
# For now, turn off the custom mdef proc for the Mac:

if {[tk windowingsystem] eq "aqua"} {
    namespace eval ::tk::mac {
	set useCustomMDEF 0
    }
}

#register to send data to macOS Services
if {[tk windowingsystem] eq "aqua"} {
proc ::tk::RegisterServiceWidget {w} {
    ::tk::mac::registerServiceWidget $w
  }
}


# Run the Ttk themed widget set initialization
if {$::ttk::library ne ""} {
    uplevel \#0 [list source $::ttk::library/ttk.tcl]
}
 
# Local Variables:
# mode: tcl
# fill-column: 78
# End: