From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Sun, 24 Aug 2003 20:11:54 +0000 (+0000)
Subject: Use "Base" version of wxBell on OS/2.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/189d1ae7a0185f442396cb3865bf1eeb3f5ff07c

Use "Base" version of wxBell on OS/2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 69f73141b6..39bd7eaa57 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -56,11 +56,14 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library
 
 void wxBell()
 {
     gdk_beep();
 }
+#endif
 
 /* Don't synthesize KeyUp events holding down a key and producing
    KeyDown events with autorepeat. */
diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index 69f73141b6..39bd7eaa57 100644
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -56,11 +56,14 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library
 
 void wxBell()
 {
     gdk_beep();
 }
+#endif
 
 /* Don't synthesize KeyUp events holding down a key and producing
    KeyDown events with autorepeat. */
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index b14765332d..77bdbe3d6b 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -127,11 +127,14 @@ 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()
 {
diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 8221b95431..604a87e828 100644
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -92,11 +92,14 @@ 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()
 {