Merge branch 'adv-merge'

Move the entire contents of wxAdv library into wxCore.

In the future, wxAdv will disappear entirely, but for now keep it as an
empty placeholder to allow the existing make/project files to work.

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

docs/changes.txt

@@ -101,6 +101,8 @@ All:
 
 All (GUI):
 
+- wxAdvanced library was merged into wxCore, simply remove all references
+  to "adv" from your build system, it is not needed any longer.
 - Add wxDataViewToggleRenderer::ShowAsRadio().
 - Improve stock items consistency and aesthetics (dhowland).
 - Fix bug with missing items in overflowing AUI toolbar (Maarten Bent).

docs/doxygen/mainpages/const_cpp.h

@@ -219,7 +219,6 @@ desirable, for example because some of them were not built and this is where
 the symbols in this section can be helpful: defining them allows to not link
 with the corresponding library. The following symbols are honoured:
 
-    - wxNO_ADV_LIB
     - wxNO_AUI_LIB
     - wxNO_HTML_LIB
     - wxNO_MEDIA_LIB

docs/doxygen/mainpages/libs.h

@@ -29,7 +29,6 @@ digraph Dependencies
     wxNet      [fillcolor = deepskyblue, URL = "\ref page_libs_wxnet"];
     wxXML      [fillcolor = deepskyblue, URL = "\ref page_libs_wxxml"];
 
-    wxAdvanced [fillcolor = green, URL = "\ref page_libs_wxadv"];
     wxAUI      [fillcolor = green, URL = "\ref page_libs_wxaui"];
     wxGL       [fillcolor = green, URL = "\ref page_libs_wxgl"];
     wxHTML     [fillcolor = green, URL = "\ref page_libs_wxhtml"];
@@ -46,17 +45,16 @@ digraph Dependencies
     wxNet -> wxBase;
     wxXML -> wxBase;
 
-    wxAdvanced -> wxCore;
-    wxAUI -> wxAdvanced; wxAUI -> wxHTML;
+    wxAUI -> wxCore; wxAUI -> wxHTML;
     wxGL -> wxCore;
     wxHTML -> wxCore;
     wxMedia -> wxCore;
-    wxPropertyGrid -> wxAdvanced;
+    wxPropertyGrid -> wxCore;
     wxQA -> wxCore; wxQA -> wxXML;
     wxRibbon -> wxCore;
-    wxRichText -> wxAdvanced; wxRichText -> wxHTML; wxRichText -> wxXML;
+    wxRichText -> wxCore; wxRichText -> wxHTML; wxRichText -> wxXML;
     wxSTC -> wxCore;
-    wxXRC -> wxAdvanced; wxXRC -> wxHTML; wxXRC -> wxXML;
+    wxXRC -> wxCore; wxXRC -> wxHTML; wxXRC -> wxXML;
     wxWebView -> wxCore;
 }
 @enddot
@@ -66,32 +64,17 @@ libraries depend on the @ref page_libs_wxbase library (i.e. they are non-GUI
 libraries), and all green libraries depend on the @ref page_libs_wxcore library
 (i.e. they are GUI libraries).
 
-
-
-@section page_libs_wxadv wxAdvanced
-
-Advanced or rarely used GUI classes:
-
-@li wxCalendarCtrl
-@li wxGrid classes
-@li wxJoystick
-@li wxLayoutAlgorithm
-@li wxSplashScreen
-@li wxTaskBarIcon
-@li wxSound
-@li wxWizard
-@li wxSashLayoutWindow
-@li wxSashWindow
-@li ...others
-
-Requires @ref page_libs_wxcore and @ref page_libs_wxbase.
+@note Until wxWidgets 3.1.2 some core GUI classes were in a separate wxAdvanced
+    library, but this library was merged into wxCore and, while it's still
+    preserved as an empty library for compatibility, should be never used any
+    longer and will disappear completely in the future.
 
 
 @section page_libs_wxaui wxAui
 
 This contains the Advanced User Interface docking library.
 
-Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
+Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
 @ref page_libs_wxcore, @ref page_libs_wxbase.
 
 
@@ -156,7 +139,7 @@ Requires @ref page_libs_wxbase.
 
 This contains the wxPropertyGrid control.
 
-Requires @ref page_libs_wxadv, @ref page_libs_wxcore, @ref page_libs_wxbase.
+Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
 
 
 @section page_libs_wxqa wxQA
@@ -179,7 +162,7 @@ Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
 
 This contains generic rich text control functionality.
 
-Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
+Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
 @ref page_libs_wxcore, @ref page_libs_wxbase.
 
 
@@ -209,7 +192,7 @@ Requires @ref page_libs_wxbase.
 This library contains wxXmlResource class that provides access to XML resource
 files in XRC format.
 
-Requires @ref page_libs_wxadv, @ref page_libs_wxhtml, @ref page_libs_wxxml,
+Requires @ref page_libs_wxhtml, @ref page_libs_wxxml,
 @ref page_libs_wxcore, @ref page_libs_wxbase.
 
 */

docs/doxygen/mainpages/screenshots.h

@@ -46,22 +46,6 @@ or directory, font or colour, ...) directly from the window containing them:
 @appearance_brief{wxFontPickerCtrl,fontpickerctrl}
 
 
-@section page_screenshots_adv Advanced Controls
-
-These controls are considered to be less common and are defined in
-@ref page_libs_wxadv "adv" library:
-
-@appearance_brief{wxActivityIndicator,activityindicator}
-@appearance_brief{wxAnimationCtrl,animationctrl}
-@genericAppearance_brief{wxBannerWindow,bannerwindow}
-@appearance_brief{wxBitmapComboBox,bitmapcombobox}
-@appearance_brief{wxCalendarCtrl,calendarctrl}
-@appearance_brief{wxComboCtrl,comboctrl}
-@appearance_brief{wxCommandLinkButton,commandlinkbutton}
-@appearance_brief{wxHyperlinkCtrl,hyperlinkctrl}
-@appearance_brief{wxOwnerDrawnComboBox,ownerdrawncombobox}
-
-
 @section page_screenshots_book Book Controls
 
 Book controls contain several pages (also called tabs in wxNotebook case) and
@@ -86,9 +70,18 @@ column) list:
 
 @section page_screenshots_misc Miscellaneous Other Controls
 
+@appearance_brief{wxActivityIndicator,activityindicator}
+@appearance_brief{wxAnimationCtrl,animationctrl}
+@genericAppearance_brief{wxBannerWindow,bannerwindow}
+@appearance_brief{wxBitmapComboBox,bitmapcombobox}
+@appearance_brief{wxCalendarCtrl,calendarctrl}
 @appearance_brief{wxCollapsiblePane,collapsiblepane}
+@appearance_brief{wxComboCtrl,comboctrl}
+@appearance_brief{wxCommandLinkButton,commandlinkbutton}
 @appearance_brief{wxDirCtrl,genericdirctrl}
 @appearance_brief{wxFileCtrl,filectrl}
+@appearance_brief{wxHyperlinkCtrl,hyperlinkctrl}
+@appearance_brief{wxOwnerDrawnComboBox,ownerdrawncombobox}
 @appearance_brief{wxRichTextCtrl,richtextctrl}
 @appearance_brief{wxRichToolTip,richtooltip}