Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-27 19:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into stc-document-map

Browse Source 
Resolve conflicts in Xcode projects by regenerating them.
This commit is contained in:
Vadim Zeitlin
2025-10-21 02:08:39 +02:00
parent 9d75245d08 5550862651
commit e17485d4c5
29 changed files with 10285 additions and 9955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/bakefiles/files.bkl
+1
View File
@@ -2377,6 +2377,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/iphone/anybutton.mm
src/osx/iphone/button.mm
src/osx/iphone/checkbox.mm
src/osx/iphone/choice.mm
src/osx/iphone/colour.mm
src/osx/iphone/dialog.mm
src/osx/iphone/evtloop.mm
build/cmake/files.cmake
+1
View File
@@ -2231,6 +2231,7 @@ set(OSX_IPHONE_SRC
src/osx/iphone/anybutton.mm
src/osx/iphone/button.mm
src/osx/iphone/checkbox.mm
src/osx/iphone/choice.mm
src/osx/iphone/colour.mm
src/osx/iphone/dialog.mm
src/osx/iphone/evtloop.mm
build/files
+1
View File
@@ -2232,6 +2232,7 @@ OSX_IPHONE_SRC =
src/osx/iphone/anybutton.mm
src/osx/iphone/button.mm
src/osx/iphone/checkbox.mm
src/osx/iphone/choice.mm
src/osx/iphone/colour.mm
src/osx/iphone/dialog.mm
src/osx/iphone/evtloop.mm
build/osx/wxcocoa.xcodeproj/project.pbxproj
+7035 -7035
View File
File diff suppressed because it is too large Load Diff
build/osx/wxiphone.xcodeproj/project.pbxproj
+2868 -2864
View File
File diff suppressed because it is too large Load Diff