Merge branch 'string-art-ids'

Make the wxART_* constants const wxStrings to improve compatibility with
pre-3.1.4 code and, in particular, allow taking the address of these
constants.

See https://github.com/wxWidgets/wxWidgets/pull/1996

build/bakefiles/files.bkl

@@ -1131,6 +1131,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/anidecod.h
     wx/animdecod.h
     wx/appprogress.h
+    wx/artids.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h

build/cmake/files.cmake

@@ -1039,6 +1039,7 @@ set(GUI_CMN_HDR
     wx/anidecod.h
     wx/animdecod.h
     wx/appprogress.h
+    wx/artids.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h

build/files

@@ -936,6 +936,7 @@ GUI_CMN_HDR =
     wx/animdecod.h
     wx/anybutton.h
     wx/appprogress.h
+    wx/artids.h
     wx/artprov.h
     wx/bannerwindow.h
     wx/bitmap.h

build/msw/wx_core.vcxproj

@@ -1502,6 +1502,7 @@
     <ClInclude Include="..\..\include\wx\richtooltip.h" />
     <ClInclude Include="..\..\include\wx\generic\gridsel.h" />
     <ClInclude Include="..\..\include\wx\dcbuffer.h" />
+    <ClInclude Include="..\..\include\wx\artids.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/msw/wx_core.vcxproj.filters

@@ -1108,6 +1108,9 @@
     <ClInclude Include="..\..\include\wx\appprogress.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\wx\artids.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\wx\artprov.h">
       <Filter>Common Headers</Filter>
     </ClInclude>

build/msw/wx_vc7_core.vcproj

@@ -2081,6 +2081,9 @@
 			<File
 				RelativePath="..\..\include\wx\ribbon\art_internal.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\artids.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\artprov.h">
 			</File>

build/msw/wx_vc8_core.vcproj

@@ -3276,6 +3276,10 @@
 				RelativePath="..\..\include\wx\ribbon\art_internal.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\artids.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\artprov.h"
 				>

build/msw/wx_vc9_core.vcproj

@@ -3272,6 +3272,10 @@
 				RelativePath="..\..\include\wx\ribbon\art_internal.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\artids.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\artprov.h"
 				>