Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 17:02:51 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Move wxOSX chkconf.h and evtloopsrc.h files to base library

Browse Source 
They are always used, independent of the toolkit.

Fixes #24583
This commit is contained in:
Maarten Bent
2026-01-18 01:40:46 +01:00
committed by Vadim Zeitlin
parent 79983d80ce
commit 8c733d9c4d
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+9 -7
View File
@@ -965,6 +965,9 @@ ALL_PORTS_BASE_HEADERS = \
wx/msw/wrapcdlg.h \
wx/msw/wrapwin.h \
wx/msw/fswatcher.h \
wx/osx/chkconf.h \
wx/osx/cocoa/chkconf.h \
wx/osx/iphone/chkconf.h \
wx/osx/core/cfdataref.h \
wx/osx/core/cfref.h \
wx/osx/core/cfstring.h \
@@ -991,6 +994,7 @@ ALL_PORTS_BASE_HEADERS = \
wx/unix/stackwalk.h \
wx/unix/fswatcher_kqueue.h \
wx/osx/fswatcher_fsevents.h \
wx/osx/evtloopsrc.h \
wx/fs_inet.h \
wx/protocol/file.h \
wx/protocol/ftp.h \
@@ -2641,6 +2645,9 @@ COND_PLATFORM_WIN32_1_GTK_PLATFORM_HDR = \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_PLATFORM_HDR = wx/aui/tabartgtk.h
@COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h
COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR = \
wx/osx/chkconf.h \
wx/osx/cocoa/chkconf.h \
wx/osx/iphone/chkconf.h \
wx/osx/core/cfdataref.h \
wx/osx/core/cfref.h \
wx/osx/core/cfstring.h \
@@ -2666,7 +2673,8 @@ COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR = \
wx/unix/pipe.h \
wx/unix/stackwalk.h \
wx/unix/fswatcher_kqueue.h \
wx/osx/fswatcher_fsevents.h
wx/osx/fswatcher_fsevents.h \
wx/osx/evtloopsrc.h
@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_MACOSX_1_BASE_PLATFORM_HDR)
COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \
wx/unix/fswatcher_inotify.h \
@@ -3215,7 +3223,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \
wx/osx/button.h \
wx/osx/checkbox.h \
wx/osx/checklst.h \
wx/osx/chkconf.h \
wx/osx/choice.h \
wx/osx/clipbrd.h \
wx/osx/colordlg.h \
@@ -3235,7 +3242,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \
wx/osx/dirdlg.h \
wx/osx/dnd.h \
wx/osx/evtloop.h \
wx/osx/evtloopsrc.h \
wx/osx/filedlg.h \
wx/osx/font.h \
wx/osx/fontdlg.h \
@@ -3294,7 +3300,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \
wx/osx/appprogress.h \
wx/generic/icon.h \
wx/generic/imaglist.h \
wx/osx/cocoa/chkconf.h \
wx/osx/cocoa/evtloop.h \
wx/osx/cocoa/private.h \
wx/generic/region.h \
@@ -3320,7 +3325,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \
wx/osx/button.h \
wx/osx/checkbox.h \
wx/osx/checklst.h \
wx/osx/chkconf.h \
wx/osx/choice.h \
wx/osx/clipbrd.h \
wx/osx/colordlg.h \
@@ -3340,7 +3344,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \
wx/osx/dirdlg.h \
wx/osx/dnd.h \
wx/osx/evtloop.h \
wx/osx/evtloopsrc.h \
wx/osx/filedlg.h \
wx/osx/font.h \
wx/osx/fontdlg.h \
@@ -3399,7 +3402,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \
wx/osx/appprogress.h \
wx/generic/icon.h \
wx/generic/imaglist.h \
wx/osx/iphone/chkconf.h \
wx/osx/iphone/private.h \
wx/generic/region.h \
wx/osx/sound.h
build/bakefiles/files.bkl
+4 -4
View File
@@ -202,9 +202,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/core/mimetype.cpp
</set>
<set var="BASE_OSX_HDR" hints="files">
wx/osx/chkconf.h
wx/osx/cocoa/chkconf.h
wx/osx/iphone/chkconf.h
$(BASE_COREFOUNDATION_HDR)
$(BASE_UNIX_AND_DARWIN_HDR)
wx/osx/fswatcher_fsevents.h
wx/osx/evtloopsrc.h
</set>
<!-- Base and GUI files used by OS X -->
@@ -2178,7 +2182,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/button.h
wx/osx/checkbox.h
wx/osx/checklst.h
wx/osx/chkconf.h
wx/osx/choice.h
wx/osx/clipbrd.h
wx/osx/colordlg.h
@@ -2198,7 +2201,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/dirdlg.h
wx/osx/dnd.h
wx/osx/evtloop.h
wx/osx/evtloopsrc.h
wx/osx/filedlg.h
wx/osx/font.h
wx/osx/fontdlg.h
@@ -2324,7 +2326,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/cocoa/power.mm
</set>
<set var="OSX_COCOA_HDR" hints="files">
wx/osx/cocoa/chkconf.h
wx/osx/cocoa/evtloop.h
wx/osx/cocoa/private.h
wx/generic/region.h
@@ -2377,7 +2378,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="OSX_IPHONE_HDR" hints="files">
wx/osx/iphone/chkconf.h
wx/osx/iphone/private.h
wx/generic/region.h
wx/osx/sound.h
build/cmake/files.cmake
+5 -5
View File
@@ -138,9 +138,13 @@ set(BASE_OSX_SRC
)
set(BASE_OSX_HDR
wx/osx/fswatcher_fsevents.h
wx/osx/chkconf.h
wx/osx/cocoa/chkconf.h
wx/osx/iphone/chkconf.h
${BASE_COREFOUNDATION_HDR}
${BASE_UNIX_AND_DARWIN_HDR}
wx/osx/fswatcher_fsevents.h
wx/osx/evtloopsrc.h
)
set(BASE_AND_GUI_OSX_COCOA_SRC
@@ -2044,7 +2048,6 @@ set(OSX_SHARED_HDR
wx/osx/button.h
wx/osx/checkbox.h
wx/osx/checklst.h
wx/osx/chkconf.h
wx/osx/choice.h
wx/osx/clipbrd.h
wx/osx/colordlg.h
@@ -2064,7 +2067,6 @@ set(OSX_SHARED_HDR
wx/osx/dirdlg.h
wx/osx/dnd.h
wx/osx/evtloop.h
wx/osx/evtloopsrc.h
wx/osx/filedlg.h
wx/osx/font.h
wx/osx/fontdlg.h
@@ -2187,7 +2189,6 @@ set(OSX_COCOA_SRC
)
set(OSX_COCOA_HDR
wx/osx/cocoa/chkconf.h
wx/osx/cocoa/evtloop.h
wx/osx/cocoa/private.h
wx/generic/region.h
@@ -2236,7 +2237,6 @@ set(OSX_IPHONE_SRC
)
set(OSX_IPHONE_HDR
wx/osx/iphone/chkconf.h
wx/osx/iphone/private.h
wx/generic/region.h
wx/osx/sound.h
build/files
+4 -4
View File
@@ -161,9 +161,13 @@ BASE_OSX_SRC =
src/osx/fswatcher_fsevents.cpp
BASE_OSX_HDR =
wx/osx/chkconf.h
wx/osx/cocoa/chkconf.h
wx/osx/iphone/chkconf.h
$(BASE_UNIX_AND_DARWIN_HDR)
$(BASE_COREFOUNDATION_HDR)
wx/osx/fswatcher_fsevents.h
wx/osx/evtloopsrc.h
# Base and GUI files used by OS X
BASE_AND_GUI_OSX_COCOA_SRC =
@@ -2043,7 +2047,6 @@ OSX_SHARED_HDR =
wx/osx/button.h
wx/osx/checkbox.h
wx/osx/checklst.h
wx/osx/chkconf.h
wx/osx/choice.h
wx/osx/clipbrd.h
wx/osx/colordlg.h
@@ -2063,7 +2066,6 @@ OSX_SHARED_HDR =
wx/osx/dirdlg.h
wx/osx/dnd.h
wx/osx/evtloop.h
wx/osx/evtloopsrc.h
wx/osx/filedlg.h
wx/osx/font.h
wx/osx/fontdlg.h
@@ -2187,7 +2189,6 @@ OSX_COCOA_SRC =
OSX_COCOA_HDR =
wx/generic/region.h
wx/osx/activityindicator.h
wx/osx/cocoa/chkconf.h
wx/osx/cocoa/dataview.h
wx/osx/cocoa/evtloop.h
wx/osx/cocoa/private.h
@@ -2235,7 +2236,6 @@ OSX_IPHONE_SRC =
OSX_IPHONE_HDR =
wx/generic/region.h
wx/osx/iphone/chkconf.h
wx/osx/iphone/private.h
wx/osx/sound.h