X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9aecec9a948123b780ed5bbeef0c3307ca06c5ca..580ca0a4e10dbd2fb0a144065004394b9d5dcc56:/include/wx/apptrait.h

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 1de2cfea7d..3595571c28 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -110,13 +110,18 @@ public:
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
 #endif
 
-    // return information about the (native) toolkit currently used;
+    // return information about the (native) toolkit currently used and its
+    // runtime (not compile-time) version.
     // returns wxPORT_BASE for console applications and one of the remaining
     // wxPORT_* values for GUI applications.
     virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0;
 
     // return true if the port is using wxUniversal for the GUI, false if not
     virtual bool IsUsingUniversalWidgets() const = 0;
+    
+    // return the name of the Desktop Environment such as 
+    // "KDE" or "GNOME". May return an empty string.
+    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
 };
 
 // ----------------------------------------------------------------------------
@@ -238,12 +243,12 @@ public:
     #include "wx/palmos/apptrait.h"
 #elif defined(__WIN32__)
     #include "wx/msw/apptrait.h"
-#elif defined(__UNIX__) && !defined(__EMX__)
+#elif defined(__OS2__)
+    #include "wx/os2/apptrait.h"
+#elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/apptrait.h"
 #elif defined(__DOS__)
     #include "wx/msdos/apptrait.h"
 #else