Remove private headers from files.bkl.

Private headers are not supposed to be installed because they are only use
when building wxWidgets itself, so don't list them in files.bkl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 0781fd86f6ab9123cf11f952cbafc7c93cbe8003..49bb8e47dff3ba1b7579e789dd4767f8c819d78f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2335,7 +2335,6 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR =  \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \

-       wx/osx/core/private/strconv_cf.h \

        wx/unix/app.h \
        wx/unix/apptbase.h \
        wx/unix/apptrait.h \
        wx/unix/app.h \
        wx/unix/apptbase.h \
        wx/unix/apptrait.h \


@@ -2356,7 +2355,6 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/stdpaths.h \

-       wx/osx/core/private/strconv_cf.h \

        wx/unix/app.h \
        wx/unix/apptbase.h \
        wx/unix/apptrait.h \
        wx/unix/app.h \
        wx/unix/apptbase.h \
        wx/unix/apptrait.h \


@@ -2389,8 +2387,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \

-       wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h
+       wx/osx/core/stdpaths.h

 @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
 COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
        wx/unix/app.h \
 @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
 COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
        wx/unix/app.h \


@@ -2412,8 +2409,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \

-       wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h
+       wx/osx/core/stdpaths.h

 @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
 COND_TOOLKIT_X11_BASE_OSX_HDR =  \
        wx/unix/app.h \
 @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
 COND_TOOLKIT_X11_BASE_OSX_HDR =  \
        wx/unix/app.h \


@@ -2435,8 +2431,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \

-       wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h
+       wx/osx/core/stdpaths.h

 @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
 COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
        wx/unix/app.h \
 @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
 COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
        wx/unix/app.h \


@@ -2458,8 +2453,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \

-       wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h
+       wx/osx/core/stdpaths.h

 @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
 COND_TOOLKIT__BASE_OSX_HDR =  \
        wx/unix/app.h \
 @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
 COND_TOOLKIT__BASE_OSX_HDR =  \
        wx/unix/app.h \


@@ -2481,8 +2475,7 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \
        wx/osx/core/hid.h \
        wx/osx/core/objcid.h \
        wx/osx/core/private.h \

-       wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h
+       wx/osx/core/stdpaths.h

 @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
 @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
 @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
 @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h


@@ -2626,7 +2619,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
        wx/gtk/nonownedwnd.h \
        wx/gtk/pen.h \
        wx/gtk/popupwin.h \
        wx/gtk/nonownedwnd.h \
        wx/gtk/pen.h \
        wx/gtk/popupwin.h \

-       wx/gtk/private/win_gtk.h \

        wx/gtk/region.h \
        wx/gtk/tooltip.h \
        wx/gtk/toplevel.h \
        wx/gtk/region.h \
        wx/gtk/tooltip.h \
        wx/gtk/toplevel.h \


@@ -3184,9 +3176,6 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
        wx/osx/carbon/chkconf.h \
        wx/osx/carbon/evtloop.h \
        wx/osx/carbon/private.h \
        wx/osx/carbon/chkconf.h \
        wx/osx/carbon/evtloop.h \
        wx/osx/carbon/private.h \

-       wx/osx/carbon/private/mactext.h \
-       wx/osx/carbon/private/overlay.h \
-       wx/osx/carbon/private/print.h \

        wx/osx/carbon/region.h \
        wx/osx/carbon/statbmp.h \
        wx/osx/carbon/uma.h
        wx/osx/carbon/region.h \
        wx/osx/carbon/statbmp.h \
        wx/osx/carbon/uma.h


@@ -3293,9 +3282,6 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
        wx/osx/carbon/chkconf.h \
        wx/osx/carbon/evtloop.h \
        wx/osx/carbon/private.h \
        wx/osx/carbon/chkconf.h \
        wx/osx/carbon/evtloop.h \
        wx/osx/carbon/private.h \

-       wx/osx/carbon/private/mactext.h \
-       wx/osx/carbon/private/overlay.h \
-       wx/osx/carbon/private/print.h \

        wx/osx/carbon/region.h \
        wx/osx/carbon/statbmp.h \
        wx/osx/carbon/uma.h \
        wx/osx/carbon/region.h \
        wx/osx/carbon/statbmp.h \
        wx/osx/carbon/uma.h \


@@ -3403,9 +3389,6 @@ COND_TOOLKIT_OSX_IPHONE_GUI_HDR =  \
        wx/osx/carbon/chkconf.h \
        wx/osx/carbon/evtloop.h \
        wx/osx/carbon/private.h \
        wx/osx/carbon/chkconf.h \
        wx/osx/carbon/evtloop.h \
        wx/osx/carbon/private.h \

-       wx/osx/carbon/private/mactext.h \
-       wx/osx/carbon/private/overlay.h \
-       wx/osx/carbon/private/print.h \

        wx/osx/carbon/region.h \
        wx/osx/carbon/statbmp.h \
        wx/osx/carbon/uma.h \
        wx/osx/carbon/region.h \
        wx/osx/carbon/statbmp.h \
        wx/osx/carbon/uma.h \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 95db06d3235c6f544d5606413da35e7884d3b232..1e08f1cd5e4293e6476ebd80db3f1f58888ae7da 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -200,7 +200,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/objcid.h
     wx/osx/core/private.h
     wx/osx/core/stdpaths.h
     wx/osx/core/objcid.h
     wx/osx/core/private.h
     wx/osx/core/stdpaths.h

-    wx/osx/core/private/strconv_cf.h

 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->
 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->


@@ -565,7 +564,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">

-    wx/msw/private/sockmsw.h

 </set>
 
 <set var="NET_WINCE_SRC" hints="files">
 </set>
 
 <set var="NET_WINCE_SRC" hints="files">


@@ -1110,7 +1108,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/nonownedwnd.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
     wx/gtk/nonownedwnd.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h

-    wx/gtk/private/win_gtk.h

     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h


@@ -2453,9 +2450,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/carbon/chkconf.h
     wx/osx/carbon/evtloop.h
     wx/osx/carbon/private.h
     wx/osx/carbon/chkconf.h
     wx/osx/carbon/evtloop.h
     wx/osx/carbon/private.h

-    wx/osx/carbon/private/mactext.h
-    wx/osx/carbon/private/overlay.h
-    wx/osx/carbon/private/print.h

     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h
     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h

diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp
index 48dbf92ec8736162c56e93b99eec8d719be6f606..6a940c95760ddb1e25b28cafa9dd3cf5bf64ea17 100644 (file)
--- a/build/msw/wx_net.dsp
+++ b/build/msw/wx_net.dsp
@@ -571,10 +571,6 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
 \r
 !ENDIF\r
 \r
 \r
 !ENDIF\r
 \r

-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\private\sockmsw.h\r

 # End Source File\r
 # End Group\r
 # Begin Group "Common Headers"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Common Headers"\r

diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj
index a779d09eb949f60b3e49a7947790c876b22945b0..053531361e6be9ddaa0e8ee6e0691e146a16fa77 100644 (file)
--- a/build/msw/wx_vc7_net.vcproj
+++ b/build/msw/wx_vc7_net.vcproj
@@ -803,9 +803,6 @@
                                                AdditionalDependencies=""..\..\lib\vc_dll\mswunivu\wx\msw""/>\r
                                </FileConfiguration>\r
                        </File>\r
                                                AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>\r
                                </FileConfiguration>\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\msw\private\sockmsw.h">\r
-                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r

diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj
index aadab78fb3da7a3ef4088038512aae83dbfc0bd0..03424cc709af3b1f4d4162da9a7e80772bab530f 100644 (file)
--- a/build/msw/wx_vc8_net.vcproj
+++ b/build/msw/wx_vc8_net.vcproj
@@ -1093,10 +1093,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\msw\private\sockmsw.h"\r
-                               >\r
-                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r

diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj
index b6a1f07e3f9eb7b8bc5678417ee227fbdf1b99a0..c2949ad05542824b8b5fc5955832f9fe8e2899d8 100644 (file)
--- a/build/msw/wx_vc9_net.vcproj
+++ b/build/msw/wx_vc9_net.vcproj
@@ -1089,10 +1089,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\msw\private\sockmsw.h"\r
-                               >\r
-                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r
                </Filter>\r
                <Filter\r
                        Name="Common Headers"\r