X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8eaaeb23796c69ea0f67cbd48fc5f667d9823d0..d1b20379e45636461e4aa45e5263fb3d9a4956a8:/src/motif/utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index ab645457b2..77bdbe3d6b 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -127,15 +127,19 @@ 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
 
-wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
-    wxToolkitInfo info;
+    static wxToolkitInfo info;
+
     info.shortName = _T("motif");
     info.name = _T("wxMotif");
 #ifdef __WXUNIVERSAL__
@@ -150,7 +154,7 @@ wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
     info.versionMajor = ProtocolVersion (display);
     info.versionMinor = ProtocolRevision (display);
     info.os = wxMOTIF_X;
-    return &info;
+    return info;
 }
 
 // ----------------------------------------------------------------------------