From 8bb6427f105b255b88c6699c1c064b7c8f063f37 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 18 Dec 2013 16:00:27 +0000 Subject: [PATCH] Remove wx/generic/colrdlgg.h from common GUI headers. This header is not used in all ports, notably not in wxMSW nor wxGTK. See #15753. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 1 - build/bakefiles/files.bkl | 1 - build/msw/wx_core.dsp | 4 ---- build/msw/wx_vc7_core.vcproj | 3 --- build/msw/wx_vc8_core.vcproj | 4 ---- build/msw/wx_vc9_core.vcproj | 4 ---- 6 files changed, 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0c347b577e..9f95f13fe3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4093,7 +4093,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/generic/accel.h \ wx/generic/buttonbar.h \ wx/generic/choicdgg.h \ - wx/generic/colrdlgg.h \ wx/generic/combo.h \ wx/generic/custombgwin.h \ wx/generic/dcpsg.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index c3dc4b84fd..360c06f06d 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -833,7 +833,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/accel.h wx/generic/buttonbar.h wx/generic/choicdgg.h - wx/generic/colrdlgg.h wx/generic/combo.h wx/generic/custombgwin.h wx/generic/dcpsg.h diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index f5e596e00f..937464bf39 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -1956,10 +1956,6 @@ SOURCE=..\..\include\wx\generic\collpaneg.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\generic\colrdlgg.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\generic\combo.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 5fcb0d9c2e..772004e25b 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -1650,9 +1650,6 @@ - - diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 2c34041dbb..780e7e2031 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -2209,10 +2209,6 @@ RelativePath="..\..\include\wx\generic\collpaneg.h" > - - diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index c786ec0dfd..e62422f8d0 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -2207,10 +2207,6 @@ RelativePath="..\..\include\wx\generic\collpaneg.h" > - -