Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install wx/osx/carbon/region.h header under OS X

Browse Source 
This file was mistakenly removed from the list of wxOSX headers in
602ea92143.

And don't install wx/osx/core/stdpaths.h which doesn't exist any longer (see
abe10b8c00).

Closes #17381.
This commit is contained in:
Vadim Zeitlin
2016-02-21 17:18:46 +01:00
parent b095c9d7c0
commit bd9fb66578
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.in
View File

@@ -2399,8 +2399,8 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \
wx/osx/core/evtloop.h \ wx/osx/core/evtloop.h \
wx/osx/core/objcid.h \ wx/osx/core/objcid.h \
wx/osx/core/private.h \ wx/osx/core/private.h \
wx/osx/core/stdpaths.h \
wx/osx/core/colour.h \ wx/osx/core/colour.h \
wx/osx/carbon/region.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 \
@@ -2432,8 +2432,8 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \
wx/osx/core/evtloop.h \ wx/osx/core/evtloop.h \
wx/osx/core/objcid.h \ wx/osx/core/objcid.h \
wx/osx/core/private.h \ wx/osx/core/private.h \
wx/osx/core/stdpaths.h \ wx/osx/core/colour.h \
wx/osx/core/colour.h wx/osx/carbon/region.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 \
@@ -2454,8 +2454,8 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \
wx/osx/core/evtloop.h \ wx/osx/core/evtloop.h \
wx/osx/core/objcid.h \ wx/osx/core/objcid.h \
wx/osx/core/private.h \ wx/osx/core/private.h \
wx/osx/core/stdpaths.h \ wx/osx/core/colour.h \
wx/osx/core/colour.h wx/osx/carbon/region.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 \
@@ -2476,8 +2476,8 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \
wx/osx/core/evtloop.h \ wx/osx/core/evtloop.h \
wx/osx/core/objcid.h \ wx/osx/core/objcid.h \
wx/osx/core/private.h \ wx/osx/core/private.h \
wx/osx/core/stdpaths.h \ wx/osx/core/colour.h \
wx/osx/core/colour.h wx/osx/carbon/region.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 \
@@ -2498,8 +2498,8 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \
wx/osx/core/evtloop.h \ wx/osx/core/evtloop.h \
wx/osx/core/objcid.h \ wx/osx/core/objcid.h \
wx/osx/core/private.h \ wx/osx/core/private.h \
wx/osx/core/stdpaths.h \ wx/osx/core/colour.h \
wx/osx/core/colour.h wx/osx/carbon/region.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 \
@@ -2520,8 +2520,8 @@ COND_TOOLKIT__BASE_OSX_HDR = \
wx/osx/core/evtloop.h \ wx/osx/core/evtloop.h \
wx/osx/core/objcid.h \ wx/osx/core/objcid.h \
wx/osx/core/private.h \ wx/osx/core/private.h \
wx/osx/core/stdpaths.h \ wx/osx/core/colour.h \
wx/osx/core/colour.h wx/osx/carbon/region.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 = \

2
build/bakefiles/files.bkl
View File

@@ -193,8 +193,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/core/evtloop.h wx/osx/core/evtloop.h
wx/osx/core/objcid.h wx/osx/core/objcid.h
wx/osx/core/private.h wx/osx/core/private.h
wx/osx/core/stdpaths.h
wx/osx/core/colour.h wx/osx/core/colour.h
wx/osx/carbon/region.h
</set> </set>
<!-- Base files used by OS X ports (not Carbon) --> <!-- Base files used by OS X ports (not Carbon) -->

2
build/files
View File

@@ -139,6 +139,7 @@ BASE_COREFOUNDATION_SRC =
src/osx/cocoa/utils_base.mm src/osx/cocoa/utils_base.mm
BASE_COREFOUNDATION_HDR = BASE_COREFOUNDATION_HDR =
wx/osx/carbon/region.h
wx/osx/core/cfdataref.h wx/osx/core/cfdataref.h
wx/osx/core/cfref.h wx/osx/core/cfref.h
wx/osx/core/cfstring.h wx/osx/core/cfstring.h
@@ -147,7 +148,6 @@ BASE_COREFOUNDATION_HDR =
wx/osx/core/evtloop.h wx/osx/core/evtloop.h
wx/osx/core/objcid.h wx/osx/core/objcid.h
wx/osx/core/private.h wx/osx/core/private.h
wx/osx/core/stdpaths.h
# Base files used by OS X ports (not Carbon) # Base files used by OS X ports (not Carbon)
BASE_OSX_SHARED_SRC = BASE_OSX_SHARED_SRC =