X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6769d0cbf33f56282083bfdbea08753eb60cff6b..cdb501108b32bf390d82f4840aad520030621228:/src/motif/utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 44cf0a4c56..f6b0179f11 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -17,11 +17,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
+
 #include "wx/setup.h"
 #include "wx/utils.h"
+#include "wx/apptrait.h"
 #include "wx/app.h"
 #include "wx/dcmemory.h"
 #include "wx/bitmap.h"
@@ -126,25 +131,34 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 // ----------------------------------------------------------------------------
 
 // Emit a beeeeeep
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library (src/os2/utils.cpp)
 void wxBell()
 {
     // Use current setting for the bell
     XBell (wxGlobalDisplay(), 0);
 }
+#endif
 
-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
+    static wxToolkitInfo info;
+
+    info.shortName = _T("motif");
+    info.name = _T("wxMotif");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");
+#endif
     // FIXME TODO
     // This code is WRONG!! Does NOT return the
     // Motif version of the libs but the X protocol
     // version!
     Display *display = wxGlobalDisplay();
-    if (majorVsn)
-        *majorVsn = ProtocolVersion (display);
-    if (minorVsn)
-        *minorVsn = ProtocolRevision (display);
-
-    return wxMOTIF_X;
+    info.versionMajor = ProtocolVersion (display);
+    info.versionMinor = ProtocolRevision (display);
+    info.os = wxMOTIF_X;
+    return info;
 }
 
 // ----------------------------------------------------------------------------
@@ -620,6 +634,9 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
+// Now in utilsx11.cpp
+#if 0
+
 // ----------------------------------------------------------------------------
 // keycode translations
 // ----------------------------------------------------------------------------
@@ -862,6 +879,7 @@ KeySym wxCharCodeWXToX(int id)
 
     return keySym;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines