From 61c3160340cce1d7158d671110b08204b35ee060 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 30 Jul 2018 14:52:10 +0200 Subject: [PATCH] Install the new include/wx/osx/core/cfdictionary.h header Add the new header to the list in build/files and regenerate all the files derived from it. This should have been part of 342e4454238b32617fcd1fa49a1117d80a19237a --- Makefile.in | 16 +++++++++++----- build/bakefiles/files.bkl | 1 + build/cmake/files.cmake | 1 + build/files | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 94c92f2eef..a4792e10f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2440,6 +2440,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/osx/core/private.h \ wx/osx/core/colour.h \ wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h \ wx/unix/app.h \ wx/unix/apptbase.h \ wx/unix/apptrait.h \ @@ -2472,7 +2473,8 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/colour.h \ - wx/osx/carbon/region.h + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR) COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2494,7 +2496,8 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/colour.h \ - wx/osx/carbon/region.h + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR) COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2516,7 +2519,8 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/colour.h \ - wx/osx/carbon/region.h + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR) COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2538,7 +2542,8 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/colour.h \ - wx/osx/carbon/region.h + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR) COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/app.h \ @@ -2560,7 +2565,8 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/osx/core/objcid.h \ wx/osx/core/private.h \ wx/osx/core/colour.h \ - wx/osx/carbon/region.h + wx/osx/carbon/region.h \ + wx/osx/core/cfdictionary.h @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR) @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR) COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 7e08bfd60d..c464f898f0 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -199,6 +199,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/osx/core/private.h wx/osx/core/colour.h wx/osx/carbon/region.h + wx/osx/core/cfdictionary.h diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index e8dfb59328..e503ef5777 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -127,6 +127,7 @@ set(BASE_COREFOUNDATION_HDR wx/osx/core/evtloop.h wx/osx/core/objcid.h wx/osx/core/private.h + wx/osx/core/cfdictionary.h ) set(BASE_OSX_SHARED_SRC diff --git a/build/files b/build/files index 54cb655f3a..396ed5075a 100644 --- a/build/files +++ b/build/files @@ -145,6 +145,7 @@ BASE_COREFOUNDATION_SRC = BASE_COREFOUNDATION_HDR = wx/osx/carbon/region.h wx/osx/core/cfdataref.h + wx/osx/core/cfdictionary.h wx/osx/core/cfref.h wx/osx/core/cfstring.h wx/osx/core/colour.h