fixed all the other ports broken by controls labels in wxToolBar patch commit

[wxWidgets.git] / include / wx / os2 / apptrait.h

diff --git a/include/wx/os2/apptrait.h b/include/wx/os2/apptrait.h
index 2ac1f4a8910ca9dbb46bdf576e862b110fd942d7..3b8168570c9e371224f7510e67b02287ee041454 100644 (file)
--- a/include/wx/os2/apptrait.h
+++ b/include/wx/os2/apptrait.h
@@ -19,7 +19,6 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
-    virtual wxToolkitInfo& GetToolkitInfo();
 };
 
 #if wxUSE_GUI
@@ -27,7 +26,7 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
-    virtual wxToolkitInfo& GetToolkitInfo();
+    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
 
     // wxThread helpers
     // ----------------
@@ -37,6 +36,9 @@ public:
 
     // Clean up message queue.
     virtual void TerminateGui(unsigned long ulHab);
+#ifdef __WXGTK__
+    virtual wxString GetDesktopEnvironment() const;
+#endif
 };
 
 #endif // wxUSE_GUI