use wxChar correctly in wxString docs; mark wx1 compatibility functions

[wxWidgets.git] / docs / latex / wx / apptraits.tex

diff --git a/docs/latex/wx/apptraits.tex b/docs/latex/wx/apptraits.tex
index 16f40d225006a341703dc53a8f3855a0f5173100..aba7737e8d166c7c515ae6c0c63e96bb0d34f5f1 100644 (file)
--- a/docs/latex/wx/apptraits.tex
+++ b/docs/latex/wx/apptraits.tex
@@ -68,6 +68,15 @@ this is used in GUI mode only and always returns \NULL in console.
 
 NOTE: returned pointer will be deleted by the caller.
 
+\membersection{wxAppTraits::GetDesktopEnvironment}\label{wxapptraitsgetdesktopenvironment}
+
+\constfunc{virtual wxString}{GetDesktopEnvironment}{\void}
+
+This method returns the name of the desktop environment currently
+running in a Unix desktop. Currently only "KDE" or "GNOME" are
+supported and the code uses the X11 session protocol vendor name
+to figure out, which desktop environment is running. The method
+returns an empty string otherwise and on all other platforms.
 
 \membersection{wxAppTraits::GetStandardPaths}\label{wxapptraitsgetstandardpaths}
 
@@ -83,8 +92,10 @@ It's normally the same for wxBase and wxGUI except in the case of wxMac and wxCo
 Returns the wxWidgets port ID used by the running program and eventually
 fills the given pointers with the values of the major and minor digits
 of the native toolkit currently used.
+The version numbers returned are thus detected at run-time and not compile-time
+(except when this is not possible e.g. wxMotif).
 
-E.g. if your program is using wxGTK port this function will return wxPORT_GTK and
+E.g. if your program is using wxGTK port this function will return wxPORT\_GTK and
 put in given pointers the versions of the GTK library in use.
 
 See \helpref{wxPlatformInfo}{wxplatforminfo} for more details.
@@ -113,3 +124,4 @@ 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.
+