applied SF patch #846738 mousewheel support

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

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 0bdd4ed3dca3c8623bf2524abceeaded8b989e17..604a87e828392ce7cd4e55ef957ff05b71f74a24 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -73,7 +73,7 @@ void wxFlushEvents()
 
 bool wxCheckForInterrupt(wxWindow *wnd)
 {
-    wxASSERT_MSG(FALSE, "wxCheckForInterrupt not yet implemented.");
+    wxASSERT_MSG(FALSE, wxT("wxCheckForInterrupt not yet implemented."));
     return FALSE;
 }
 
@@ -92,13 +92,16 @@ 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 ((Display*) wxGetDisplay(), 0);
 }
+#endif
 
-wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
     info.shortName = _T("x11univ");
@@ -106,7 +109,7 @@ wxToolkitInfo *wxGUIAppTraits::GetToolkitInfo()
     info.versionMajor = 0;
     info.versionMinor = 0;
     info.os = wxX11;
-    return &info;
+    return info;
 }
 
 // ----------------------------------------------------------------------------
@@ -605,8 +608,7 @@ wxString wxGetXEventName(XEvent& event)
                "ClientMessage", "MappingNotify",                         // 33-34
                "unknown(+)"};                                            // 35
            type = wxMin(35, type); type = wxMax(1, type);
-        wxString str(event_name[type]);
-        return str;
+        return wxString::FromAscii(event_name[type]);
 #endif
 }
 #endif