wx: Prepare for using Erlang types and specs

Create correct links to datatypes outside of the wx application.

The added time for generating the doc/specs/specs_* files is unwelcome
(they are currently not used).

5 files changed, 243 insertions, 2 deletions

diff --git a/lib/erl_docgen/priv/bin/xref_mod_app.escript b/lib/erl_docgen/priv/bin/xref_mod_app.escript
index ac4278bf22..4a418fe144 100755
--- a/lib/erl_docgen/priv/bin/xref_mod_app.escript
+++ b/lib/erl_docgen/priv/bin/xref_mod_app.escript
@@ -84,7 +84,7 @@ preloaded(TopDir) ->
 %% It's OK if too much data is generated as long as all applications
 %% and all modules are mentioned.
 appmods(D) ->
-    ErlFiles = filelib:wildcard(filename:join([D,"src","*.erl"])),
+    ErlFiles = filelib:wildcard(filename:join([D,"src","**","*.erl"])),
     AppV = filename:basename(D),
     App = case string:rstr(AppV, "-") of
               0 -> AppV;
diff --git a/lib/wx/doc/specs/.gitignore b/lib/wx/doc/specs/.gitignore
new file mode 100644
index 0000000000..322eebcb06
--- /dev/null
+++ b/lib/wx/doc/specs/.gitignore
@@ -0,0 +1 @@
+specs_*.xml
diff --git a/lib/wx/doc/src/Makefile b/lib/wx/doc/src/Makefile
index cae2f9fe4e..23890f47f0 100644
--- a/lib/wx/doc/src/Makefile
+++ b/lib/wx/doc/src/Makefile
@@ -63,10 +63,15 @@ HTML_REF_MAN_FILE = $(HTMLDIR)/index.html
 
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 
+SPECS_FILES = $(XML_REF3_FILES:%.xml=$(SPECDIR)/specs_%.xml)
+
+TOP_SPECS_FILE = specs.xml
+
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 XML_FLAGS +=
+SPECS_FLAGS = -I../../include -I../../src
 DVIPS_FLAGS +=
 
 # ----------------------------------------------------
@@ -111,6 +116,7 @@ clean clean_docs:
 	rm -rf  $(HTMLDIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	rm -f $(SPECDIR)/*
 	rm -f errs core *~ ../html/edoc-info
 	rm -f $(XML_REF3_FILES) $(XML_CHAPTER_FILES) *.html
 
diff --git a/lib/wx/doc/src/specs.xml b/lib/wx/doc/src/specs.xml
new file mode 100644
index 0000000000..2e19baafc4
--- /dev/null
+++ b/lib/wx/doc/src/specs.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<specs xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../specs/specs_wx.xml"/>
+  <xi:include href="../specs/specs_wx_object.xml"/>
+  <xi:include href="../specs/specs_wxAcceleratorEntry.xml"/>
+  <xi:include href="../specs/specs_wxAcceleratorTable.xml"/>
+  <xi:include href="../specs/specs_wxActivateEvent.xml"/>
+  <xi:include href="../specs/specs_wxArtProvider.xml"/>
+  <xi:include href="../specs/specs_wxAuiDockArt.xml"/>
+  <xi:include href="../specs/specs_wxAuiManager.xml"/>
+  <xi:include href="../specs/specs_wxAuiManagerEvent.xml"/>
+  <xi:include href="../specs/specs_wxAuiNotebook.xml"/>
+  <xi:include href="../specs/specs_wxAuiNotebookEvent.xml"/>
+  <xi:include href="../specs/specs_wxAuiPaneInfo.xml"/>
+  <xi:include href="../specs/specs_wxAuiSimpleTabArt.xml"/>
+  <xi:include href="../specs/specs_wxAuiTabArt.xml"/>
+  <xi:include href="../specs/specs_wxBitmapButton.xml"/>
+  <xi:include href="../specs/specs_wxBitmapDataObject.xml"/>
+  <xi:include href="../specs/specs_wxBitmap.xml"/>
+  <xi:include href="../specs/specs_wxBoxSizer.xml"/>
+  <xi:include href="../specs/specs_wxBrush.xml"/>
+  <xi:include href="../specs/specs_wxBufferedDC.xml"/>
+  <xi:include href="../specs/specs_wxBufferedPaintDC.xml"/>
+  <xi:include href="../specs/specs_wxButton.xml"/>
+  <xi:include href="../specs/specs_wxCalendarCtrl.xml"/>
+  <xi:include href="../specs/specs_wxCalendarDateAttr.xml"/>
+  <xi:include href="../specs/specs_wxCalendarEvent.xml"/>
+  <xi:include href="../specs/specs_wxCaret.xml"/>
+  <xi:include href="../specs/specs_wxCheckBox.xml"/>
+  <xi:include href="../specs/specs_wxCheckListBox.xml"/>
+  <xi:include href="../specs/specs_wxChildFocusEvent.xml"/>
+  <xi:include href="../specs/specs_wxChoicebook.xml"/>
+  <xi:include href="../specs/specs_wxChoice.xml"/>
+  <xi:include href="../specs/specs_wxClientDC.xml"/>
+  <xi:include href="../specs/specs_wxClipboard.xml"/>
+  <xi:include href="../specs/specs_wxClipboardTextEvent.xml"/>
+  <xi:include href="../specs/specs_wxCloseEvent.xml"/>
+  <xi:include href="../specs/specs_wxColourData.xml"/>
+  <xi:include href="../specs/specs_wxColourDialog.xml"/>
+  <xi:include href="../specs/specs_wxColourPickerCtrl.xml"/>
+  <xi:include href="../specs/specs_wxColourPickerEvent.xml"/>
+  <xi:include href="../specs/specs_wxComboBox.xml"/>
+  <xi:include href="../specs/specs_wxCommandEvent.xml"/>
+  <xi:include href="../specs/specs_wxContextMenuEvent.xml"/>
+  <xi:include href="../specs/specs_wxControl.xml"/>
+  <xi:include href="../specs/specs_wxControlWithItems.xml"/>
+  <xi:include href="../specs/specs_wxCursor.xml"/>
+  <xi:include href="../specs/specs_wxDataObject.xml"/>
+  <xi:include href="../specs/specs_wxDateEvent.xml"/>
+  <xi:include href="../specs/specs_wxDatePickerCtrl.xml"/>
+  <xi:include href="../specs/specs_wxDC.xml"/>
+  <xi:include href="../specs/specs_wxDCOverlay.xml"/>
+  <xi:include href="../specs/specs_wxDialog.xml"/>
+  <xi:include href="../specs/specs_wxDirDialog.xml"/>
+  <xi:include href="../specs/specs_wxDirPickerCtrl.xml"/>
+  <xi:include href="../specs/specs_wxDisplayChangedEvent.xml"/>
+  <xi:include href="../specs/specs_wxEraseEvent.xml"/>
+  <xi:include href="../specs/specs_wxEvent.xml"/>
+  <xi:include href="../specs/specs_wxEvtHandler.xml"/>
+  <xi:include href="../specs/specs_wxFileDataObject.xml"/>
+  <xi:include href="../specs/specs_wxFileDialog.xml"/>
+  <xi:include href="../specs/specs_wxFileDirPickerEvent.xml"/>
+  <xi:include href="../specs/specs_wxFilePickerCtrl.xml"/>
+  <xi:include href="../specs/specs_wxFindReplaceData.xml"/>
+  <xi:include href="../specs/specs_wxFindReplaceDialog.xml"/>
+  <xi:include href="../specs/specs_wxFlexGridSizer.xml"/>
+  <xi:include href="../specs/specs_wxFocusEvent.xml"/>
+  <xi:include href="../specs/specs_wxFontData.xml"/>
+  <xi:include href="../specs/specs_wxFontDialog.xml"/>
+  <xi:include href="../specs/specs_wxFont.xml"/>
+  <xi:include href="../specs/specs_wxFontPickerCtrl.xml"/>
+  <xi:include href="../specs/specs_wxFontPickerEvent.xml"/>
+  <xi:include href="../specs/specs_wxFrame.xml"/>
+  <xi:include href="../specs/specs_wxGauge.xml"/>
+  <xi:include href="../specs/specs_wxGBSizerItem.xml"/>
+  <xi:include href="../specs/specs_wxGenericDirCtrl.xml"/>
+  <xi:include href="../specs/specs_wxGLCanvas.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsBrush.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsContext.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsFont.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsMatrix.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsObject.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsPath.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsPen.xml"/>
+  <xi:include href="../specs/specs_wxGraphicsRenderer.xml"/>
+  <xi:include href="../specs/specs_wxGridBagSizer.xml"/>
+  <xi:include href="../specs/specs_wxGridCellAttr.xml"/>
+  <xi:include href="../specs/specs_wxGridCellBoolEditor.xml"/>
+  <xi:include href="../specs/specs_wxGridCellBoolRenderer.xml"/>
+  <xi:include href="../specs/specs_wxGridCellChoiceEditor.xml"/>
+  <xi:include href="../specs/specs_wxGridCellEditor.xml"/>
+  <xi:include href="../specs/specs_wxGridCellFloatEditor.xml"/>
+  <xi:include href="../specs/specs_wxGridCellFloatRenderer.xml"/>
+  <xi:include href="../specs/specs_wxGridCellNumberEditor.xml"/>
+  <xi:include href="../specs/specs_wxGridCellNumberRenderer.xml"/>
+  <xi:include href="../specs/specs_wxGridCellRenderer.xml"/>
+  <xi:include href="../specs/specs_wxGridCellStringRenderer.xml"/>
+  <xi:include href="../specs/specs_wxGridCellTextEditor.xml"/>
+  <xi:include href="../specs/specs_wxGrid.xml"/>
+  <xi:include href="../specs/specs_wxGridEvent.xml"/>
+  <xi:include href="../specs/specs_wxGridSizer.xml"/>
+  <xi:include href="../specs/specs_wxHelpEvent.xml"/>
+  <xi:include href="../specs/specs_wxHtmlEasyPrinting.xml"/>
+  <xi:include href="../specs/specs_wxHtmlLinkEvent.xml"/>
+  <xi:include href="../specs/specs_wxHtmlWindow.xml"/>
+  <xi:include href="../specs/specs_wxIconBundle.xml"/>
+  <xi:include href="../specs/specs_wxIcon.xml"/>
+  <xi:include href="../specs/specs_wxIconizeEvent.xml"/>
+  <xi:include href="../specs/specs_wxIdleEvent.xml"/>
+  <xi:include href="../specs/specs_wxImage.xml"/>
+  <xi:include href="../specs/specs_wxImageList.xml"/>
+  <xi:include href="../specs/specs_wxInitDialogEvent.xml"/>
+  <xi:include href="../specs/specs_wxJoystickEvent.xml"/>
+  <xi:include href="../specs/specs_wxKeyEvent.xml"/>
+  <xi:include href="../specs/specs_wxLayoutAlgorithm.xml"/>
+  <xi:include href="../specs/specs_wxListbook.xml"/>
+  <xi:include href="../specs/specs_wxListBox.xml"/>
+  <xi:include href="../specs/specs_wxListCtrl.xml"/>
+  <xi:include href="../specs/specs_wxListEvent.xml"/>
+  <xi:include href="../specs/specs_wxListItemAttr.xml"/>
+  <xi:include href="../specs/specs_wxListItem.xml"/>
+  <xi:include href="../specs/specs_wxListView.xml"/>
+  <xi:include href="../specs/specs_wxLocale.xml"/>
+  <xi:include href="../specs/specs_wxLogNull.xml"/>
+  <xi:include href="../specs/specs_wxMask.xml"/>
+  <xi:include href="../specs/specs_wxMaximizeEvent.xml"/>
+  <xi:include href="../specs/specs_wxMDIChildFrame.xml"/>
+  <xi:include href="../specs/specs_wxMDIClientWindow.xml"/>
+  <xi:include href="../specs/specs_wxMDIParentFrame.xml"/>
+  <xi:include href="../specs/specs_wxMemoryDC.xml"/>
+  <xi:include href="../specs/specs_wxMenuBar.xml"/>
+  <xi:include href="../specs/specs_wxMenu.xml"/>
+  <xi:include href="../specs/specs_wxMenuEvent.xml"/>
+  <xi:include href="../specs/specs_wxMenuItem.xml"/>
+  <xi:include href="../specs/specs_wxMessageDialog.xml"/>
+  <xi:include href="../specs/specs_wxMiniFrame.xml"/>
+  <xi:include href="../specs/specs_wxMirrorDC.xml"/>
+  <xi:include href="../specs/specs_wxMouseCaptureChangedEvent.xml"/>
+  <xi:include href="../specs/specs_wxMouseCaptureLostEvent.xml"/>
+  <xi:include href="../specs/specs_wxMouseEvent.xml"/>
+  <xi:include href="../specs/specs_wxMoveEvent.xml"/>
+  <xi:include href="../specs/specs_wxMultiChoiceDialog.xml"/>
+  <xi:include href="../specs/specs_wxNavigationKeyEvent.xml"/>
+  <xi:include href="../specs/specs_wxNotebook.xml"/>
+  <xi:include href="../specs/specs_wxNotebookEvent.xml"/>
+  <xi:include href="../specs/specs_wxNotifyEvent.xml"/>
+  <xi:include href="../specs/specs_wxOverlay.xml"/>
+  <xi:include href="../specs/specs_wxPageSetupDialogData.xml"/>
+  <xi:include href="../specs/specs_wxPageSetupDialog.xml"/>
+  <xi:include href="../specs/specs_wxPaintDC.xml"/>
+  <xi:include href="../specs/specs_wxPaintEvent.xml"/>
+  <xi:include href="../specs/specs_wxPaletteChangedEvent.xml"/>
+  <xi:include href="../specs/specs_wxPalette.xml"/>
+  <xi:include href="../specs/specs_wxPanel.xml"/>
+  <xi:include href="../specs/specs_wxPasswordEntryDialog.xml"/>
+  <xi:include href="../specs/specs_wxPen.xml"/>
+  <xi:include href="../specs/specs_wxPickerBase.xml"/>
+  <xi:include href="../specs/specs_wxPopupTransientWindow.xml"/>
+  <xi:include href="../specs/specs_wxPopupWindow.xml"/>
+  <xi:include href="../specs/specs_wxPostScriptDC.xml"/>
+  <xi:include href="../specs/specs_wxPreviewCanvas.xml"/>
+  <xi:include href="../specs/specs_wxPreviewControlBar.xml"/>
+  <xi:include href="../specs/specs_wxPreviewFrame.xml"/>
+  <xi:include href="../specs/specs_wxPrintData.xml"/>
+  <xi:include href="../specs/specs_wxPrintDialogData.xml"/>
+  <xi:include href="../specs/specs_wxPrintDialog.xml"/>
+  <xi:include href="../specs/specs_wxPrinter.xml"/>
+  <xi:include href="../specs/specs_wxPrintout.xml"/>
+  <xi:include href="../specs/specs_wxPrintPreview.xml"/>
+  <xi:include href="../specs/specs_wxProgressDialog.xml"/>
+  <xi:include href="../specs/specs_wxQueryNewPaletteEvent.xml"/>
+  <xi:include href="../specs/specs_wxRadioBox.xml"/>
+  <xi:include href="../specs/specs_wxRadioButton.xml"/>
+  <xi:include href="../specs/specs_wxRegion.xml"/>
+  <xi:include href="../specs/specs_wxSashEvent.xml"/>
+  <xi:include href="../specs/specs_wxSashLayoutWindow.xml"/>
+  <xi:include href="../specs/specs_wxSashWindow.xml"/>
+  <xi:include href="../specs/specs_wxScreenDC.xml"/>
+  <xi:include href="../specs/specs_wxScrollBar.xml"/>
+  <xi:include href="../specs/specs_wxScrolledWindow.xml"/>
+  <xi:include href="../specs/specs_wxScrollEvent.xml"/>
+  <xi:include href="../specs/specs_wxScrollWinEvent.xml"/>
+  <xi:include href="../specs/specs_wxSetCursorEvent.xml"/>
+  <xi:include href="../specs/specs_wxShowEvent.xml"/>
+  <xi:include href="../specs/specs_wxSingleChoiceDialog.xml"/>
+  <xi:include href="../specs/specs_wxSizeEvent.xml"/>
+  <xi:include href="../specs/specs_wxSizer.xml"/>
+  <xi:include href="../specs/specs_wxSizerFlags.xml"/>
+  <xi:include href="../specs/specs_wxSizerItem.xml"/>
+  <xi:include href="../specs/specs_wxSlider.xml"/>
+  <xi:include href="../specs/specs_wxSpinButton.xml"/>
+  <xi:include href="../specs/specs_wxSpinCtrl.xml"/>
+  <xi:include href="../specs/specs_wxSpinEvent.xml"/>
+  <xi:include href="../specs/specs_wxSplashScreen.xml"/>
+  <xi:include href="../specs/specs_wxSplitterEvent.xml"/>
+  <xi:include href="../specs/specs_wxSplitterWindow.xml"/>
+  <xi:include href="../specs/specs_wxStaticBitmap.xml"/>
+  <xi:include href="../specs/specs_wxStaticBox.xml"/>
+  <xi:include href="../specs/specs_wxStaticBoxSizer.xml"/>
+  <xi:include href="../specs/specs_wxStaticLine.xml"/>
+  <xi:include href="../specs/specs_wxStaticText.xml"/>
+  <xi:include href="../specs/specs_wxStatusBar.xml"/>
+  <xi:include href="../specs/specs_wxStdDialogButtonSizer.xml"/>
+  <xi:include href="../specs/specs_wxStyledTextCtrl.xml"/>
+  <xi:include href="../specs/specs_wxStyledTextEvent.xml"/>
+  <xi:include href="../specs/specs_wxSysColourChangedEvent.xml"/>
+  <xi:include href="../specs/specs_wxSystemOptions.xml"/>
+  <xi:include href="../specs/specs_wxSystemSettings.xml"/>
+  <xi:include href="../specs/specs_wxTaskBarIcon.xml"/>
+  <xi:include href="../specs/specs_wxTaskBarIconEvent.xml"/>
+  <xi:include href="../specs/specs_wxTextAttr.xml"/>
+  <xi:include href="../specs/specs_wxTextCtrl.xml"/>
+  <xi:include href="../specs/specs_wxTextDataObject.xml"/>
+  <xi:include href="../specs/specs_wxTextEntryDialog.xml"/>
+  <xi:include href="../specs/specs_wxToggleButton.xml"/>
+  <xi:include href="../specs/specs_wxToolBar.xml"/>
+  <xi:include href="../specs/specs_wxToolbook.xml"/>
+  <xi:include href="../specs/specs_wxToolTip.xml"/>
+  <xi:include href="../specs/specs_wxTopLevelWindow.xml"/>
+  <xi:include href="../specs/specs_wxTreebook.xml"/>
+  <xi:include href="../specs/specs_wxTreeCtrl.xml"/>
+  <xi:include href="../specs/specs_wxTreeEvent.xml"/>
+  <xi:include href="../specs/specs_wxUpdateUIEvent.xml"/>
+  <xi:include href="../specs/specs_wxWindowCreateEvent.xml"/>
+  <xi:include href="../specs/specs_wxWindowDC.xml"/>
+  <xi:include href="../specs/specs_wxWindowDestroyEvent.xml"/>
+  <xi:include href="../specs/specs_wxWindow.xml"/>
+  <xi:include href="../specs/specs_wxXmlResource.xml"/>
+  <xi:include href="../specs/specs_wx_misc.xml"/>
+  <xi:include href="../specs/specs_glu.xml"/>
+  <xi:include href="../specs/specs_gl.xml"/>
+</specs>
diff --git a/make/otp.mk.in b/make/otp.mk.in
index c05c499d66..3b2e1a5bba 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -4,7 +4,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2013. All Rights Reserved.
+# Copyright Ericsson AB 1997-2016. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -271,6 +271,8 @@ SPECS_EXTRACTOR=$(DOCGEN)/priv/bin/specs_gen.escript
 # Extract specifications and types from Erlang source files (-spec, -type)
 $(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/%.erl
 	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $<
+$(SPECDIR)/specs_%.xml: $(SPECS_ESRC)/gen/%.erl
+	escript $(SPECS_EXTRACTOR) $(SPECS_FLAGS) -o$(dir $@) $<
 
 
 $(MAN1DIR)/%.1: %.xml