Applied patch #876969: "Fixes to Borland warnings"; Minor code cleanup.

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index ab645457b26b4ae1f481b626054bdf6adda48d67..77bdbe3d6bb5a82358cd46a7fe74aec3dd81091b 100644 (file)
--- 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;
 }
 
 // ----------------------------------------------------------------------------