Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork32.3k
gh-124111: Update tkinter for compatibility with Tcl/Tk 9.0.0#124156
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes from1 commit
Commits
Show all changes
30 commits Select commitHold shift + click to select a range
797ab58 New branch for PR against Python 3.14.
culler03ccc1b Ttk tests on linux
cullerd7fdc88 Remove trailing whitespace.
culler9fe5e01 Add NEWS file.
culler144c754 Make Windows build work; adjust for new changes to Canvas.
culler3b21086 Attempt to restore autogenerated files that git tricked me into commi…
culler485e38a Revert other autogenerated files committed by mistake
culler5a954ec Revert one more autogenerated file committed by mistake
culler50d6958 Reference for combobox issue; address conditional definitions of _cli…
culleree186de Revert PCbuild changes; add examples for tk 9
culler1318d04 Adjust no_round for Canvas and Scrollbar.
cullere68994f Adjust _clipped for Canvas once more.
cullerc069c89 Hmmm = Canvas does clip highlightthickness.
culler8072c54 Remove message catalog.
cullerec56443 Force checks to rerun since CLA signing seems hung. (No changes.)
culler4f753f8 Merge branch 'tk9_for_python314' of github.com:culler/cpython into tk…
cullerbf2243f Update build files to use Tcl/Tk 8.6.14 by default but to allow any v…
culler77396d8 Add changes suggested by @zware
cullercf9b947 Remove trailing whitespace.
culler2ef001b Deal with test_configure_width and test_configure_height for Notebooks.
cullercc50039 Merge branch 'tk9_for_python314' of github.com:culler/cpython into tk…
culler6a9ebc1 Need to make tests pass with 8.6.14 too, for the PR checks.
culler406aeff Fix version tests in NotebookTest
culler5edecc1 Include changes suggested by @zware
cullerf661969 Merge branch 'main' into tk9_for_python314
zware822c3bf Add changes to tcltk.props and _tkinter.vcxproj suggested by @zooba
culler7d851a8 Merge branch 'tk9_for_python314' of github.com:culler/cpython into tk…
culler635d807 Merge branch 'main' into tk9_for_python314
cullerba09108 Merge remote-tracking branch 'origin/main' into tk9_for_python314
zware9075a80 Formatting fixups, remove note from build.bat
zwareFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Revert PCbuild changes; add examples for tk 9
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitee186deb4e2eb4c547e9f58460855ffa8f5ba5de
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletionsPCbuild/_tkinter_tk9.vcxproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|ARM"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|ARM64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|Win32"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGInstrument|ARM"> | ||
| <Configuration>PGInstrument</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGInstrument|ARM64"> | ||
| <Configuration>PGInstrument</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGInstrument|Win32"> | ||
| <Configuration>PGInstrument</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGInstrument|x64"> | ||
| <Configuration>PGInstrument</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGUpdate|ARM"> | ||
| <Configuration>PGUpdate</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGUpdate|ARM64"> | ||
| <Configuration>PGUpdate</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGUpdate|Win32"> | ||
| <Configuration>PGUpdate</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="PGUpdate|x64"> | ||
| <Configuration>PGUpdate</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|ARM"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>ARM</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|ARM64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|Win32"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}</ProjectGuid> | ||
| <RootNamespace>_tkinter</RootNamespace> | ||
| <Keyword>Win32Proj</Keyword> | ||
| </PropertyGroup> | ||
| <Import Project="python.props" /> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Label="Configuration"> | ||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| <CharacterSet>NotSet</CharacterSet> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <PropertyGroup> | ||
| <TargetExt>$(PyStdlibPydExt)</TargetExt> | ||
| </PropertyGroup> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| <Import Project="tcltk.props" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup> | ||
| <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup> | ||
| <ClCompile> | ||
| <AdditionalIncludeDirectories>$(tcltkDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <PreprocessorDefinitions>WITH_APPINIT;$(tclExternalTommath)%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <PreprocessorDefinitions Condition="'$(BuildForRelease)' != 'true'">Py_TCLTK_DIR="$(tcltkDir.TrimEnd('\').Replace('\', '\\'))";%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalDependencies>$(tcltkLib);%(AdditionalDependencies)</AdditionalDependencies> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="..\Modules\_tkinter.c" /> | ||
| <ClCompile Include="..\Modules\tkappinit.c" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ResourceCompile Include="..\PC\python_nt.rc" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <_TclTkDLL Include="$(tcltkdir)\bin\$(tclDllName)" /> | ||
| <_TclTkDLL Include="$(tcltkdir)\bin\$(tkDllName)" /> | ||
| <_TclTkDLL Include="$(tcltkdir)\bin\$(tclZlibDllName)" /> | ||
| <_TclTkDLL Include="$(tcltkdir)\bin\$(tommathDllName)" Condition="'' == $(tclExternalTommath)" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="pythoncore.vcxproj"> | ||
| <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project> | ||
| <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| <Target Name="_CopyTclTkDLL" Inputs="@(_TclTkDLL)" Outputs="@(_TclTkDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build"> | ||
| <Copy SourceFiles="@(_TclTkDLL)" DestinationFolder="$(OutDir)" UseHardlinksIfPossible="true" /> | ||
| </Target> | ||
| <Target Name="_CleanTclTkDLL" BeforeTargets="Clean"> | ||
| <Delete Files="@(_TclTkDLL->'$(OutDir)%(Filename)%(Extension)')" /> | ||
| </Target> | ||
| <Target Name="_WriteTCL_LIBRARY" Outputs="$(OutDir)TCL_LIBRARY.env" AfterTargets="Build"> | ||
| <WriteLinesToFile File="$(OutDir)TCL_LIBRARY.env" Lines="$(tcltkdir)\lib\tcl$(TclMajorVersion).$(TclMinorVersion)" Encoding="utf-8" Overwrite="true" /> | ||
| </Target> | ||
| <Target Name="_CleanTCL_LIBRARY" BeforeTargets="Clean"> | ||
| <Delete Files="$(OutDir)TCL_LIBRARY.env" /> | ||
| </Target> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletionsPCbuild/tcltk9.props
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Import Project="pyproject.props" Condition="$(__PyProject_Props_Imported) != 'true'" /> | ||
| <PropertyGroup> | ||
| <TclVersion Condition="$(TclVersion) == ''">9.0.0.0</TclVersion> | ||
| <TkVersion Condition="$(TkVersion) == ''">$(TclVersion)</TkVersion> | ||
| <TclMajorVersion>$([System.Version]::Parse($(TclVersion)).Major)</TclMajorVersion> | ||
| <TclMinorVersion>$([System.Version]::Parse($(TclVersion)).Minor)</TclMinorVersion> | ||
| <TclPatchLevel>$([System.Version]::Parse($(TclVersion)).Build)</TclPatchLevel> | ||
| <TclRevision>$([System.Version]::Parse($(TclVersion)).Revision)</TclRevision> | ||
| <TkMajorVersion>$([System.Version]::Parse($(TkVersion)).Major)</TkMajorVersion> | ||
| <TkMinorVersion>$([System.Version]::Parse($(TkVersion)).Minor)</TkMinorVersion> | ||
| <TkPatchLevel>$([System.Version]::Parse($(TkVersion)).Build)</TkPatchLevel> | ||
| <TkRevision>$([System.Version]::Parse($(TkVersion)).Revision)</TkRevision> | ||
| <tclDir Condition="$(tclDir) == ''">$(ExternalsDir)tcl-core-$(TclVersion)\</tclDir> | ||
| <tkDir Condition="$(tkDir) == ''">$(ExternalsDir)tk-$(TkVersion)\</tkDir> | ||
| <tcltkDir Condition="$(tcltkDir) == ''">$(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\</tcltkDir> | ||
| <tclWin32Exe Condition="$(Platform) == 'Win32'">$(tcltkDir)\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe> | ||
| <tclWin32Exe Condition="$(Platform) != 'Win32'">$(tcltkDir)\..\win32\bin\tclsh$(TclMajorVersion)$(TclMinorVersion)t.exe</tclWin32Exe> | ||
| <tclExternalTommath Condition="$(TclMajorVersion) == '9'">TCL_WITH_EXTERNAL_TOMMATH;</tclExternalTommath> | ||
| <!--<TclDebugExt Condition="'$(Configuration)' == 'Debug'">g</TclDebugExt>--> | ||
| <tclDLLName>tcl$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).dll</tclDLLName> | ||
| <tclLibName>tcl$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).lib</tclLibName> | ||
| <tclShExeName>tclsh$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).exe</tclShExeName> | ||
| <tkDLLName>tcl9tk$(TkMajorVersion)$(TkMinorVersion)$(TclDebugExt).dll</tkDLLName> | ||
| <tkLibName>tcl9tk$(TkMajorVersion)$(TkMinorVersion)$(TclDebugExt).lib</tkLibName> | ||
| <tclZlibDLLName>zlib1.dll</tclZlibDLLName> | ||
| <tommathDLLName>libtommath.dll</tommathDLLName> | ||
| <tcltkLib>$(tcltkDir)lib\tcl$(TclMajorVersion)$(TclMinorVersion)$(TclDebugExt).lib;$(tcltkDir)lib\tcl9tk$(TkMajorVersion)$(TkMinorVersion)$(TclDebugExt).lib;$(tcltkDir)lib\tommath.lib</tcltkLib> | ||
| <TclMachine>IX86</TclMachine> | ||
| <TclMachine Condition="'$(Platform)' == 'x64'">AMD64</TclMachine> | ||
| <TclMachine Condition="'$(Platform)' == 'ARM64'">ARM64</TclMachine> | ||
| <TclVersions>TCL_MAJOR_VERSION=$(TclMajorVersion) TCL_MINOR_VERSION=$(TclMinorVersion) TCL_PATCH_LEVEL=$(TclPatchLevel)</TclVersions> | ||
| <TclShortVersions>TCL_MAJOR=$(TclMajorVersion) TCL_MINOR=$(TclMinorVersion) TCL_PATCH=$(TclPatchLevel)</TclShortVersions> | ||
| <TkVersions>TK_MAJOR_VERSION=$(TkMajorVersion) TK_MINOR_VERSION=$(TkMinorVersion) TK_PATCH_LEVEL=$(TkPatchLevel)</TkVersions> | ||
| <BuildDirTop>Release</BuildDirTop> | ||
| <BuildDirTop Condition="$(Configuration) == 'Debug'">Debug</BuildDirTop> | ||
| <BuildDirTop Condition="$(TclMachine) != 'IX86'">$(BuildDirTop)_$(TclMachine)</BuildDirTop> | ||
| <BuildDirTop Condition="$(PlatformToolset.StartsWith('v14'))">$(BuildDirTop)_VC13</BuildDirTop> | ||
| <BuildDirTop Condition="$(PlatformToolset) == 'v120'">$(BuildDirTop)_VC12</BuildDirTop> | ||
| <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop> | ||
| <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop> | ||
| </PropertyGroup> | ||
| <!-- | ||
| Helper target for copying the lib to a specific directory. | ||
| Using "msbuild tcltk.props /t:CopyTclTkLib /p:OutDir=..." is generally | ||
| easier than trying to extract the value of $(tcltkdir). | ||
| --> | ||
| <Target Name="CopyTclTkLib"> | ||
| <ItemGroup> | ||
| <_TclTkLib Include="$(tcltkdir)\lib\**\*" /> | ||
| </ItemGroup> | ||
| <Copy SourceFiles="@(_TclTkLib)" | ||
| DestinationFiles="$(OutDir)\%(RecursiveDir)\%(Filename)%(Extension)" | ||
| UseHardlinksIfPossible="true" /> | ||
| </Target> | ||
| </Project> |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.