Move wx/html/forcelnk.h back to wxHTML from wxBase headers.

This partially undoes r32570 which doesn't seem necessary any more as
wx/html/forcelnk.h is only used in wxHTML since the addition of wx/link.h soon
after that revision and having it in wxBase is completely unnecessary and just
looks strange.

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

Makefile.in

@@ -411,7 +411,6 @@ ALL_BASE_HEADERS =  \
 	wx/hash.h \
 	wx/hashmap.h \
 	wx/hashset.h \
-	wx/html/forcelnk.h \
 	wx/iconloc.h \
 	wx/init.h \
 	wx/intl.h \
@@ -593,7 +592,6 @@ ALL_PORTS_BASE_HEADERS =  \
 	wx/hash.h \
 	wx/hashmap.h \
 	wx/hashset.h \
-	wx/html/forcelnk.h \
 	wx/iconloc.h \
 	wx/init.h \
 	wx/intl.h \
@@ -3203,6 +3201,11 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/toplevel.h \
 	wx/msw/treectrl.h \
 	wx/msw/window.h \
+	wx/msw/checklst.h \
+	wx/msw/fdrepdlg.h \
+	wx/msw/fontdlg.h \
+	wx/msw/ole/automtn.h \
+	wx/msw/ole/uuid.h \
 	wx/msw/wx.manifest \
 	wx/msw/amd64.manifest \
 	wx/msw/ia64.manifest \
@@ -3230,12 +3233,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
 	wx/msw/mdi.ico \
 	wx/msw/question.ico \
 	wx/msw/removble.ico \
-	wx/msw/std.ico \
+	wx/msw/std.ico
-	wx/msw/checklst.h \
-	wx/msw/fdrepdlg.h \
-	wx/msw/fontdlg.h \
-	wx/msw/ole/automtn.h \
-	wx/msw/ole/uuid.h
 @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR)
 COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
 	wx/html/webkit.h \
@@ -3645,34 +3643,6 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
 	wx/msw/toplevel.h \
 	wx/msw/treectrl.h \
 	wx/msw/window.h \
-	wx/msw/wx.manifest \
-	wx/msw/amd64.manifest \
-	wx/msw/ia64.manifest \
-	wx/msw/wx.rc \
-	wx/msw/colours.bmp \
-	wx/msw/csquery.bmp \
-	wx/msw/blank.cur \
-	wx/msw/bullseye.cur \
-	wx/msw/cross.cur \
-	wx/msw/hand.cur \
-	wx/msw/magnif1.cur \
-	wx/msw/pbrush.cur \
-	wx/msw/pencil.cur \
-	wx/msw/pntleft.cur \
-	wx/msw/pntright.cur \
-	wx/msw/roller.cur \
-	wx/msw/cdrom.ico \
-	wx/msw/child.ico \
-	wx/msw/computer.ico \
-	wx/msw/drive.ico \
-	wx/msw/file1.ico \
-	wx/msw/floppy.ico \
-	wx/msw/folder1.ico \
-	wx/msw/folder2.ico \
-	wx/msw/mdi.ico \
-	wx/msw/question.ico \
-	wx/msw/removble.ico \
-	wx/msw/std.ico \
 	wx/generic/fdrepdlg.h \
 	wx/generic/filedlgg.h \
 	wx/generic/fontdlgg.h \
@@ -4210,6 +4180,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/html/winpars.h \
 	wx/wxhtml.h \
 	wx/htmllbox.h \
+	wx/html/forcelnk.h \
 	$(MSW_HTML_HDR) \
 	wx/glcanvas.h \
 	$(OPENGL_HDR_PLATFORM) \

build/bakefiles/files.bkl

@@ -412,7 +412,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/hash.h
     wx/hashmap.h
     wx/hashset.h
-    wx/html/forcelnk.h
     wx/iconloc.h
     wx/init.h
     wx/intl.h
@@ -3168,6 +3167,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxhtml.h
     <!-- wxHTML users: -->
     wx/htmllbox.h
+    wx/html/forcelnk.h
 </set>
 <set var="HTML_HDR" hints="files">
     $(HTML_CMN_HDR)

build/files

@@ -334,7 +334,6 @@ BASE_CMN_HDR =
     wx/hash.h
     wx/hashmap.h
     wx/hashset.h
-    wx/html/forcelnk.h
     wx/iconloc.h
     wx/init.h
     wx/intl.h
@@ -2842,6 +2841,7 @@ HTML_CMN_SRC =
 HTML_MSW_HDR =
     wx/msw/helpbest.h
 HTML_CMN_HDR =
+    wx/html/forcelnk.h
     wx/html/helpctrl.h
     wx/html/helpdata.h
     wx/html/helpdlg.h

build/msw/wx_vc10_base.vcxproj

@@ -660,7 +660,6 @@
     <ClInclude Include="..\..\include\wx\msw\wrapcdlg.h" />
     <ClInclude Include="..\..\include\wx\msw\wrapwin.h" />
     <ClInclude Include="..\..\include\wx\generic\fswatcher.h" />
-    <ClInclude Include="..\..\include\wx\html\forcelnk.h" />
     <ClInclude Include="..\..\include\wx\afterstd.h" />
     <ClInclude Include="..\..\include\wx\any.h" />
     <ClInclude Include="..\..\include\wx\anystr.h" />

build/msw/wx_vc10_base.vcxproj.filters

@@ -19,9 +19,6 @@
     <Filter Include="Generic Headers">
       <UniqueIdentifier>{61C63C83-EF8C-51CA-A418-51936E7FCD4A}</UniqueIdentifier>
     </Filter>
-    <Filter Include="wxHTML Headers">
-      <UniqueIdentifier>{B4103426-A5DB-5CF0-A30E-BC9546513AAF}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Common Headers">
       <UniqueIdentifier>{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}</UniqueIdentifier>
     </Filter>
@@ -556,9 +553,6 @@
     <ClInclude Include="..\..\include\wx\hashset.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\html\forcelnk.h">
-      <Filter>wxHTML Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\iconloc.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc10_html.vcxproj

@@ -554,6 +554,7 @@
     <ClInclude Include="..\..\include\wx\html\winpars.h" />
     <ClInclude Include="..\..\include\wx\htmllbox.h" />
     <ClInclude Include="..\..\include\wx\wxhtml.h" />
+    <ClInclude Include="..\..\include\wx\html\forcelnk.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/msw/wx_vc10_html.vcxproj.filters

@@ -30,9 +30,6 @@
     <ClCompile Include="..\..\src\common\dummy.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\helpbest.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\htmllbox.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -108,6 +105,9 @@
     <ClCompile Include="..\..\src\html\winpars.cpp">
       <Filter>wxHTML Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\helpbest.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -115,8 +115,8 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\wx\msw\helpbest.h">
+    <ClInclude Include="..\..\include\wx\html\forcelnk.h">
-      <Filter>MSW Headers</Filter>
+      <Filter>wxHTML Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\html\helpctrl.h">
       <Filter>wxHTML Headers</Filter>
@@ -169,6 +169,9 @@
     <ClInclude Include="..\..\include\wx\htmllbox.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\helpbest.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\wxhtml.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc11_base.vcxproj

@@ -660,7 +660,6 @@
     <ClInclude Include="..\..\include\wx\msw\wrapcdlg.h" />
     <ClInclude Include="..\..\include\wx\msw\wrapwin.h" />
     <ClInclude Include="..\..\include\wx\generic\fswatcher.h" />
-    <ClInclude Include="..\..\include\wx\html\forcelnk.h" />
     <ClInclude Include="..\..\include\wx\afterstd.h" />
     <ClInclude Include="..\..\include\wx\any.h" />
     <ClInclude Include="..\..\include\wx\anystr.h" />

build/msw/wx_vc11_base.vcxproj.filters

@@ -19,9 +19,6 @@
     <Filter Include="Generic Headers">
       <UniqueIdentifier>{61C63C83-EF8C-51CA-A418-51936E7FCD4A}</UniqueIdentifier>
     </Filter>
-    <Filter Include="wxHTML Headers">
-      <UniqueIdentifier>{B4103426-A5DB-5CF0-A30E-BC9546513AAF}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Common Headers">
       <UniqueIdentifier>{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}</UniqueIdentifier>
     </Filter>
@@ -556,9 +553,6 @@
     <ClInclude Include="..\..\include\wx\hashset.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\html\forcelnk.h">
-      <Filter>wxHTML Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\iconloc.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc11_html.vcxproj

@@ -554,6 +554,7 @@
     <ClInclude Include="..\..\include\wx\html\winpars.h" />
     <ClInclude Include="..\..\include\wx\htmllbox.h" />
     <ClInclude Include="..\..\include\wx\wxhtml.h" />
+    <ClInclude Include="..\..\include\wx\html\forcelnk.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/msw/wx_vc11_html.vcxproj.filters

@@ -30,9 +30,6 @@
     <ClCompile Include="..\..\src\common\dummy.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\helpbest.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\htmllbox.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -108,6 +105,9 @@
     <ClCompile Include="..\..\src\html\winpars.cpp">
       <Filter>wxHTML Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\helpbest.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -115,8 +115,8 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\wx\msw\helpbest.h">
+    <ClInclude Include="..\..\include\wx\html\forcelnk.h">
-      <Filter>MSW Headers</Filter>
+      <Filter>wxHTML Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\html\helpctrl.h">
       <Filter>wxHTML Headers</Filter>
@@ -169,6 +169,9 @@
     <ClInclude Include="..\..\include\wx\htmllbox.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\helpbest.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\wxhtml.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc12_base.vcxproj

@@ -660,7 +660,6 @@
     <ClInclude Include="..\..\include\wx\msw\wrapcdlg.h" />
     <ClInclude Include="..\..\include\wx\msw\wrapwin.h" />
     <ClInclude Include="..\..\include\wx\generic\fswatcher.h" />
-    <ClInclude Include="..\..\include\wx\html\forcelnk.h" />
     <ClInclude Include="..\..\include\wx\afterstd.h" />
     <ClInclude Include="..\..\include\wx\any.h" />
     <ClInclude Include="..\..\include\wx\anystr.h" />

build/msw/wx_vc12_base.vcxproj.filters

@@ -19,9 +19,6 @@
     <Filter Include="Generic Headers">
       <UniqueIdentifier>{61C63C83-EF8C-51CA-A418-51936E7FCD4A}</UniqueIdentifier>
     </Filter>
-    <Filter Include="wxHTML Headers">
-      <UniqueIdentifier>{B4103426-A5DB-5CF0-A30E-BC9546513AAF}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Common Headers">
       <UniqueIdentifier>{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}</UniqueIdentifier>
     </Filter>
@@ -556,9 +553,6 @@
     <ClInclude Include="..\..\include\wx\hashset.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\html\forcelnk.h">
-      <Filter>wxHTML Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\iconloc.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc12_html.vcxproj

@@ -554,6 +554,7 @@
     <ClInclude Include="..\..\include\wx\html\winpars.h" />
     <ClInclude Include="..\..\include\wx\htmllbox.h" />
     <ClInclude Include="..\..\include\wx\wxhtml.h" />
+    <ClInclude Include="..\..\include\wx\html\forcelnk.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/msw/wx_vc12_html.vcxproj.filters

@@ -30,9 +30,6 @@
     <ClCompile Include="..\..\src\common\dummy.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\helpbest.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\generic\htmllbox.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -108,6 +105,9 @@
     <ClCompile Include="..\..\src\html\winpars.cpp">
       <Filter>wxHTML Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msw\helpbest.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -115,8 +115,8 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\wx\msw\helpbest.h">
+    <ClInclude Include="..\..\include\wx\html\forcelnk.h">
-      <Filter>MSW Headers</Filter>
+      <Filter>wxHTML Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\wx\html\helpctrl.h">
       <Filter>wxHTML Headers</Filter>
@@ -169,6 +169,9 @@
     <ClInclude Include="..\..\include\wx\htmllbox.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\msw\helpbest.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\wxhtml.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc7_base.vcproj

@@ -844,13 +844,6 @@
 				RelativePath="..\..\include\wx\generic\fswatcher.h">
 			</File>
 		</Filter>
-		<Filter
-			Name="wxHTML Headers"
-			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
-			<File
-				RelativePath="..\..\include\wx\html\forcelnk.h">
-			</File>
-		</Filter>
 		<Filter
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">

build/msw/wx_vc7_core.vcproj

@@ -1786,6 +1786,9 @@
 		<Filter
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
+			<File
+				RelativePath="..\..\include\wx\html\forcelnk.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h">
 			</File>

build/msw/wx_vc7_html.vcproj

@@ -502,6 +502,9 @@
 		<Filter
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
+			<File
+				RelativePath="..\..\include\wx\html\forcelnk.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h">
 			</File>

build/msw/wx_vc8_base.vcproj

@@ -1134,15 +1134,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="wxHTML Headers"
-			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
-			>
-			<File
-				RelativePath="..\..\include\wx\html\forcelnk.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"

build/msw/wx_vc8_core.vcproj

@@ -2390,6 +2390,10 @@
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
 			>
+			<File
+				RelativePath="..\..\include\wx\html\forcelnk.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h"
 				>

build/msw/wx_vc8_html.vcproj

@@ -678,6 +678,10 @@
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
 			>
+			<File
+				RelativePath="..\..\include\wx\html\forcelnk.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h"
 				>

build/msw/wx_vc9_base.vcproj

@@ -1132,15 +1132,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="wxHTML Headers"
-			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
-			>
-			<File
-				RelativePath="..\..\include\wx\html\forcelnk.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"

build/msw/wx_vc9_core.vcproj

@@ -2388,6 +2388,10 @@
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
 			>
+			<File
+				RelativePath="..\..\include\wx\html\forcelnk.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h"
 				>

build/msw/wx_vc9_html.vcproj

@@ -676,6 +676,10 @@
 			Name="wxHTML Headers"
 			UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
 			>
+			<File
+				RelativePath="..\..\include\wx\html\forcelnk.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\html\helpctrl.h"
 				>