wxPlatformInfo::IsUsingUniversalWidgets() was broken by design, it couldn't work in wxBase shared by 2+ wxCores; fixed by making it non-static and moving its implementation back to wxAppTraits (where its equivalent used to be) and making small API changes implied by that

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

docs/latex/wx/apptraits.tex

@@ -36,6 +36,46 @@ None
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
+\membersection{wxAppTraits::CreateFontMapper}\label{wxapptraitscreatefontmapper}
+
+\func{virtual wxFontMapper *}{CreateFontMapper}{\void}
+
+Creates the global font mapper object used for encodings/charset mapping.
+
+
+
+\membersection{wxAppTraits::CreateLogTarget}\label{wxapptraitscreatelogtarget}
+
+\func{virtual wxLog *}{CreateLogTarget}{\void}
+
+Creates the default log target for the application.
+
+
+\membersection{wxAppTraits::CreateMessageOutput}\label{wxapptraitscreatemessageoutput}
+
+\func{virtual wxMessageOutput *}{CreateMessageOutput}{\void}
+
+Creates the global object used for printing out messages.
+
+
+\membersection{wxAppTraits::CreateRenderer}\label{wxapptraitscreaterenderer}
+
+\func{virtual wxRendererNative *}{CreateRenderer}{\void}
+
+Returns the renderer to use for drawing the generic controls (return value may be \NULL
+in which case the default renderer for the current platform is used);
+this is used in GUI mode only and always returns \NULL in console.
+
+NOTE: returned pointer will be deleted by the caller.
+
+
+\membersection{wxAppTraits::GetStandardPaths}\label{wxapptraitsgetstandardpaths}
+
+\func{virtual wxStandardPaths \&}{GetStandardPaths}{\void}
+
+Returns the wxStandardPaths object for the application.
+It's normally the same for wxBase and wxGUI except in the case of wxMac and wxCocoa.
+
 \membersection{wxAppTraits::GetToolkitVersion}\label{wxapptraitsgettoolkitversion}
 
 \func{virtual wxPortId}{GetToolkitVersion}{\param{int *}{major = NULL}, \param{int *}{minor = NULL}}
@@ -50,7 +90,6 @@ put in given pointers the versions of the GTK library in use.
 See \helpref{wxPlatformInfo}{wxplatforminfo} for more details.
 
 
-
 \membersection{wxAppTraits::HasStderr}\label{wxapptraitshasstderr}
 
 \func{virtual bool}{HasStderr}{\void}
@@ -58,6 +97,13 @@ See \helpref{wxPlatformInfo}{wxplatforminfo} for more details.
 Returns \true if {\tt fprintf(stderr)} goes somewhere, \false otherwise.
 
 
+\membersection{wxAppTraits::IsUsingUniversalWidgets}\label{wxapptraitsisusinguniversalwidgets}
+
+\constfunc{bool}{IsUsingUniversalWidgets}{\void}
+
+Returns \true if the library was built as wxUniversal. Always returns
+\false for wxBase-only apps.
+
 
 \membersection{wxAppTraits::ShowAssertDialog}\label{wxapptraitsshowassertdialog}
 
@@ -67,50 +113,3 @@ Shows the assert dialog with the specified message in GUI mode or just prints
 the string to stderr in console mode.
 
 Returns \true to suppress subsequent asserts, \false to continue as before.
-
-
-
-\membersection{wxAppTraits::GetStandardPaths}\label{wxapptraitsgetstandardpaths}
-
-\func{virtual wxStandardPaths \&}{GetStandardPaths}{\void}
-
-Returns the wxStandardPaths object for the application.
-It's normally the same for wxBase and wxGUI except in the case of wxMac and wxCocoa.
-
-
-
-\membersection{wxAppTraits::CreateRenderer}\label{wxapptraitscreaterenderer}
-
-\func{virtual wxRendererNative *}{CreateRenderer}{\void}
-
-Returns the renderer to use for drawing the generic controls (return value may be \NULL
-in which case the default renderer for the current platform is used);
-this is used in GUI mode only and always returns \NULL in console.
-
-NOTE: returned pointer will be deleted by the caller.
-
-
-
-\membersection{wxAppTraits::CreateLogTarget}\label{wxapptraitscreatelogtarget}
-
-\func{virtual wxLog *}{CreateLogTarget}{\void}
-
-Creates the default log target for the application.
-
-
-
-\membersection{wxAppTraits::CreateMessageOutput}\label{wxapptraitscreatemessageoutput}
-
-\func{virtual wxMessageOutput *}{CreateMessageOutput}{\void}
-
-Creates the global object used for printing out messages.
-
-
-
-\membersection{wxAppTraits::CreateFontMapper}\label{wxapptraitscreatefontmapper}
-
-\func{virtual wxFontMapper *}{CreateFontMapper}{\void}
-
-Creates the global font mapper object used for encodings/charset mapping.
-
-

docs/latex/wx/platinfo.tex

@@ -271,10 +271,13 @@ Returns the wxWidgets port ID associated with this wxPlatformInfo instance.
 
 \membersection{wxPlatformInfo::GetPortIdName}\label{wxplatforminfogetportidname}
 
-\func{static wxString}{GetPortIdName}{\param{wxPortId }{port}}
+\func{static wxString}{GetPortIdName}{\param{wxPortId }{port}, \param{bool }{usingUniversal}}
 
-Returns the name of the given wxWidgets port ID value. The returned string always starts with
-the "wx" prefix and is a mixed-case string.
+Returns the name of the given wxWidgets port ID value. The \arg{usingUniversal}
+argument specifies whether the port is in its native or wxUniversal variant.
+
+The returned string always starts with the "wx" prefix and is a mixed-case
+string.
 
 \constfunc{wxString}{GetPortIdName}{\void}
 
@@ -285,10 +288,14 @@ Returns the name of the wxWidgets port ID associated with this wxPlatformInfo in
 
 \membersection{wxPlatformInfo::GetPortIdShortName}\label{wxplatforminfogetportidshortname}
 
-\func{static wxString}{GetPortIdShortName}{\param{wxPortId }{port}}
+\func{static wxString}{GetPortIdShortName}{\param{wxPortId }{port}, \param{bool }{usingUniversal}}
 
-Returns the short name of the given wxWidgets port ID value. The returned string does not start with
-the "wx" prefix and is always lower case.
+Returns the short name of the given wxWidgets port ID value. The
+\arg{usingUniversal} argument specifies whether the port is in its native or
+wxUniversal variant.
+
+The returned string does not start with the "wx" prefix and is always lower
+case.
 
 \constfunc{wxString}{GetPortIdShortName}{\void}
 
@@ -324,10 +331,9 @@ Returns \true if this instance is fully initialized with valid values.
 
 \membersection{wxPlatformInfo::IsUsingUniversalWidgets}\label{wxplatforminfoisusinguniversalwidgets}
 
-\func{bool}{IsUsingUniversalWidgets}{\void}
+\constfunc{bool}{IsUsingUniversalWidgets}{\void}
 
-Returns \true if \_\_WXUNIVERSAL\_\_ symbol is defined. Note that this function always
-returns a constant value defined at compile-time and exists just for completeness.
+Returns \true if this wxPlatformInfo describes wxUniversal build.
 
 
 \membersection{wxPlatformInfo::SetArchitecture}\label{wxplatforminfosetarchitecture}