Add missing Mac headers to the file list

Add wx/osx/core/dataview.h and wx/osx/core/mimetype.h and reorder the
files alphabetically.

Closes https://github.com/wxWidgets/wxWidgets/pull/1797
This commit is contained in:
Konstantin S. Matveyev
2020-04-14 20:52:03 +03:00
committed by Vadim Zeitlin
parent 548d27afd2
commit 4d7000d3d4
4 changed files with 36 additions and 14 deletions

View File

@@ -2472,6 +2472,9 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \
wx/osx/core/cfdictionary.h \ wx/osx/core/cfdictionary.h \
wx/osx/core/cfarray.h \ wx/osx/core/cfarray.h \
wx/osx/core/cftype.h \ wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h \
wx/unix/app.h \ wx/unix/app.h \
wx/unix/apptbase.h \ wx/unix/apptbase.h \
wx/unix/apptrait.h \ wx/unix/apptrait.h \
@@ -2507,7 +2510,10 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \
wx/osx/carbon/region.h \ wx/osx/carbon/region.h \
wx/osx/core/cfdictionary.h \ wx/osx/core/cfdictionary.h \
wx/osx/core/cfarray.h \ wx/osx/core/cfarray.h \
wx/osx/core/cftype.h wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR) @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
COND_TOOLKIT_GTK_BASE_OSX_HDR = \ COND_TOOLKIT_GTK_BASE_OSX_HDR = \
wx/unix/app.h \ wx/unix/app.h \
@@ -2532,7 +2538,10 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \
wx/osx/carbon/region.h \ wx/osx/carbon/region.h \
wx/osx/core/cfdictionary.h \ wx/osx/core/cfdictionary.h \
wx/osx/core/cfarray.h \ wx/osx/core/cfarray.h \
wx/osx/core/cftype.h wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR) @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
COND_TOOLKIT_X11_BASE_OSX_HDR = \ COND_TOOLKIT_X11_BASE_OSX_HDR = \
wx/unix/app.h \ wx/unix/app.h \
@@ -2557,7 +2566,10 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \
wx/osx/carbon/region.h \ wx/osx/carbon/region.h \
wx/osx/core/cfdictionary.h \ wx/osx/core/cfdictionary.h \
wx/osx/core/cfarray.h \ wx/osx/core/cfarray.h \
wx/osx/core/cftype.h wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR) @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \
wx/unix/app.h \ wx/unix/app.h \
@@ -2582,7 +2594,10 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \
wx/osx/carbon/region.h \ wx/osx/carbon/region.h \
wx/osx/core/cfdictionary.h \ wx/osx/core/cfdictionary.h \
wx/osx/core/cfarray.h \ wx/osx/core/cfarray.h \
wx/osx/core/cftype.h wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR) @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
COND_TOOLKIT__BASE_OSX_HDR = \ COND_TOOLKIT__BASE_OSX_HDR = \
wx/unix/app.h \ wx/unix/app.h \
@@ -2607,7 +2622,10 @@ COND_TOOLKIT__BASE_OSX_HDR = \
wx/osx/carbon/region.h \ wx/osx/carbon/region.h \
wx/osx/core/cfdictionary.h \ wx/osx/core/cfdictionary.h \
wx/osx/core/cfarray.h \ wx/osx/core/cfarray.h \
wx/osx/core/cftype.h wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \
@@ -3417,8 +3435,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \
wx/osx/dataview.h \ wx/osx/dataview.h \
wx/osx/datectrl.h \ wx/osx/datectrl.h \
wx/osx/timectrl.h \ wx/osx/timectrl.h \
wx/osx/datetimectrl.h \ wx/osx/datetimectrl.h
wx/osx/core/joystick.h
@COND_TOOLKIT_OSX_COCOA@GUI_HDR = $(COND_TOOLKIT_OSX_COCOA_GUI_HDR) @COND_TOOLKIT_OSX_COCOA@GUI_HDR = $(COND_TOOLKIT_OSX_COCOA_GUI_HDR)
COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \ COND_TOOLKIT_OSX_IPHONE_GUI_HDR = \
wx/html/webkit.h \ wx/html/webkit.h \

View File

@@ -201,6 +201,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/core/cfdictionary.h wx/osx/core/cfdictionary.h
wx/osx/core/cfarray.h wx/osx/core/cfarray.h
wx/osx/core/cftype.h wx/osx/core/cftype.h
wx/osx/core/joystick.h
wx/osx/core/mimetype.h
wx/osx/core/dataview.h
</set> </set>
<!-- Base files used by OS X ports (not Carbon) --> <!-- Base files used by OS X ports (not Carbon) -->
@@ -2667,7 +2670,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/datectrl.h wx/osx/datectrl.h
wx/osx/timectrl.h wx/osx/timectrl.h
wx/osx/datetimectrl.h wx/osx/datetimectrl.h
wx/osx/core/joystick.h
</set> </set>
<!-- ====================================================================== --> <!-- ====================================================================== -->

View File

@@ -129,6 +129,9 @@ set(BASE_COREFOUNDATION_HDR
wx/osx/core/cfdictionary.h wx/osx/core/cfdictionary.h
wx/osx/core/cfarray.h wx/osx/core/cfarray.h
wx/osx/core/cftype.h wx/osx/core/cftype.h
wx/osx/core/joystick.h
wx/osx/core/mimetype.h
wx/osx/core/dataview.h
) )
set(BASE_OSX_SHARED_SRC set(BASE_OSX_SHARED_SRC
@@ -2541,7 +2544,6 @@ set(OSX_COCOA_HDR
wx/osx/datetimectrl.h wx/osx/datetimectrl.h
wx/osx/taskbarosx.h wx/osx/taskbarosx.h
wx/osx/dvrenderers.h wx/osx/dvrenderers.h
wx/osx/core/joystick.h
) )
set(OSX_IPHONE_SRC set(OSX_IPHONE_SRC

View File

@@ -143,15 +143,18 @@ BASE_COREFOUNDATION_SRC =
BASE_COREFOUNDATION_HDR = BASE_COREFOUNDATION_HDR =
wx/osx/carbon/region.h wx/osx/carbon/region.h
wx/osx/core/cfdataref.h
wx/osx/core/cfarray.h wx/osx/core/cfarray.h
wx/osx/core/cfdataref.h
wx/osx/core/cfdictionary.h wx/osx/core/cfdictionary.h
wx/osx/core/cftype.h
wx/osx/core/cfref.h wx/osx/core/cfref.h
wx/osx/core/cfstring.h wx/osx/core/cfstring.h
wx/osx/core/cftype.h
wx/osx/core/colour.h wx/osx/core/colour.h
wx/osx/core/hid.h wx/osx/core/dataview.h
wx/osx/core/evtloop.h wx/osx/core/evtloop.h
wx/osx/core/hid.h
wx/osx/core/joystick.h
wx/osx/core/mimetype.h
wx/osx/core/objcid.h wx/osx/core/objcid.h
wx/osx/core/private.h wx/osx/core/private.h
@@ -2510,8 +2513,6 @@ OSX_COCOA_HDR =
wx/osx/cocoa/evtloop.h wx/osx/cocoa/evtloop.h
wx/osx/cocoa/private.h wx/osx/cocoa/private.h
wx/osx/cocoa/stdpaths.h wx/osx/cocoa/stdpaths.h
wx/osx/core/joystick.h
wx/osx/core/joystick.h
wx/osx/dataview.h wx/osx/dataview.h
wx/osx/datectrl.h wx/osx/datectrl.h
wx/osx/datetimectrl.h wx/osx/datetimectrl.h