new VC++ project files with both dll and lib in one project

[wxWidgets.git] / src / x11 / utils.cpp

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 05aa9ad7ff6ea48349b3e401776b5d1068535344..22d3476ac8230bc9f0d85c00716361a6553ebf64 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -20,6 +20,7 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
+#include "wx/apptrait.h"
 #include "wx/msgdlg.h"
 #include "wx/cursor.h"
 #include "wx/window.h" // for wxTopLevelWindows
@@ -97,15 +98,15 @@ void wxBell()
     XBell ((Display*) wxGetDisplay(), 0);
 }
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
-    if (majorVsn)
-        *majorVsn = 0;
-        
-    if (minorVsn)
-        *minorVsn = 0;
-        
-    return wxX11;
+    static wxToolkitInfo info;
+    info.shortName = _T("x11univ");
+    info.name = _T("wxX11");
+    info.versionMajor = 0;
+    info.versionMinor = 0;
+    info.os = wxX11;
+    return info;
 }
 
 // ----------------------------------------------------------------------------