allow compilation with wxUSE_CHOICEDLG set to 0

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 413b8266fb91db5ee207d4e298c6b313b2e02d8c..f6b0179f115000803174b219c32a02796304a07c 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -17,9 +17,13 @@
 // 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"
@@ -127,15 +131,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 info;
+    static wxToolkitInfo info;
+
     info.shortName = _T("motif");
     info.name = _T("wxMotif");
 #ifdef __WXUNIVERSAL__
@@ -626,6 +634,9 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
+// Now in utilsx11.cpp
+#if 0
+
 // ----------------------------------------------------------------------------
 // keycode translations
 // ----------------------------------------------------------------------------
@@ -868,6 +879,7 @@ KeySym wxCharCodeWXToX(int id)
 
     return keySym;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines