wx/tls.h belongs to base headers, not core (#10148)

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

diff --git a/Makefile.in b/Makefile.in
index 3d6628788b3b7792b49c93caa8bf3898bdcaea52..3f9e482c358e2d46f778e8839f0480cd23f3205c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -412,6 +412,7 @@ ALL_BASE_HEADERS =  \
        wx/thread.h \
        wx/thrimpl.cpp \
        wx/timer.h \
        wx/thread.h \
        wx/thrimpl.cpp \
        wx/timer.h \

+       wx/tls.h \

        wx/tokenzr.h \
        wx/tracker.h \
        wx/txtstrm.h \
        wx/tokenzr.h \
        wx/tracker.h \
        wx/txtstrm.h \


@@ -566,6 +567,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/thread.h \
        wx/thrimpl.cpp \
        wx/timer.h \
        wx/thread.h \
        wx/thrimpl.cpp \
        wx/timer.h \

+       wx/tls.h \

        wx/tokenzr.h \
        wx/tracker.h \
        wx/txtstrm.h \
        wx/tokenzr.h \
        wx/tracker.h \
        wx/txtstrm.h \


@@ -3714,7 +3716,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/textctrl.h \
        wx/textdlg.h \
        wx/textentry.h \
        wx/textctrl.h \
        wx/textdlg.h \
        wx/textentry.h \

-       wx/tls.h \

        wx/toolbar.h \
        wx/validate.h \
        wx/valtext.h \
        wx/toolbar.h \
        wx/validate.h \
        wx/valtext.h \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index db6ee2173bec1b628d67cf119d2bbe61582c0533..af7aedd79aeb74da8ed8a204d3e4769092c19991 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -503,6 +503,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/thread.h
     wx/thrimpl.cpp
     wx/timer.h
     wx/thread.h
     wx/thrimpl.cpp
     wx/timer.h

+    wx/tls.h

     wx/tokenzr.h
     wx/tracker.h
     wx/txtstrm.h
     wx/tokenzr.h
     wx/tracker.h
     wx/txtstrm.h


@@ -831,7 +832,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h

-    wx/tls.h

     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index e7135aa8b5c7f213e659f8a6966c3332ff4a0df8..d6c69b16cbb1bc1f4ebaa8137c83d667dcf7cc8a 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1451,6 +1451,10 @@ SOURCE=..\..\include\wx\timer.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\tls.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\tokenzr.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\tokenzr.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index aa79954e7803f792662aa9c3c5d26cdfb7a209c4..1cdf8b9d3165653a3084da17821fb3fdc614a5cf 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -6462,10 +6462,6 @@ SOURCE=..\..\include\wx\tipwin.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\tls.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\toolbar.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\toolbar.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 8a5445ab75ee112db7648a4004f409773d23019f..346a695396bf74c37b1bf7f6e9575cc0084d488a 100644 (file)
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1506,6 +1506,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\timer.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\timer.h">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\tls.h">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 3b9c2e76aebe86f59b373d345f40f672e0975162..d0be2e1bb97818a749bb9975182c316da19bf19d 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4096,9 +4096,6 @@
                        <File\r
                                RelativePath="..\..\include\wx\tipwin.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\tipwin.h">\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\tls.h">\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index dad89b94bec36a13d052a34c3b540b302827b3af..5488e4a90e982351925e4b94e1c3b8f22700d770 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -2031,6 +2031,10 @@
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\tls.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h"\r
                                >\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index b3e09054e9df90350158a58d656b1b80ff4aeffd..28360a98a019d9e8da376f52acdaad17787a9498 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -5483,10 +5483,6 @@
                                RelativePath="..\..\include\wx\tipwin.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\tipwin.h"\r
                                >\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\tls.h"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 76c4048ff23fab469c7375a9f1da3297e89eb399..ca63c03a7a6f01cff0ba8e9e990fb80bca13428c 100644 (file)
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -2027,6 +2027,10 @@
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\tls.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\tokenzr.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 24ebaad88ea1ff6ba5c8d1da462ca154339e51bf..f6fb8da4e73cab261b192ea77a29e44168026a7e 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -5479,10 +5479,6 @@
                                RelativePath="..\..\include\wx\tipwin.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\tipwin.h"\r
                                >\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\include\wx\tls.h"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\toolbar.h"\r
                                >\r

diff --git a/wxGTK.spec b/wxGTK.spec
index 96ccc0d06c61d69ed45a7587136a9835e7258474..15bda243954e7a684d072b4144de178039f024ee 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -311,6 +311,7 @@ wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h

+wx/tls.h

 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h
 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h

diff --git a/wxMotif.spec b/wxMotif.spec
index 43a9968d9a0d4176f68591debab5c453f4eb6856..817e118617f7dc3d5b68be1702095cf34a59d804 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -216,6 +216,7 @@ wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h

+wx/tls.h

 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h
 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h

diff --git a/wxX11.spec b/wxX11.spec
index 6d142abc0d8ed4c72e39bab17f07ad640ff8919f..bcec15dff03eb51b297e78a4d281db792e549a6f 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -240,6 +240,7 @@ wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h
 wx/thread.h
 wx/thrimpl.cpp
 wx/timer.h

+wx/tls.h

 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h
 wx/tokenzr.h
 wx/tracker.h
 wx/txtstrm.h