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 69f73141b683bd5523897bf1d0c81c7663124ba0..39bd7eaa5718cee6b37914b715b0d021c8552c6f 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -56,11 +56,14 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------

+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library

 
 void wxBell()
 {
     gdk_beep();
 }
 
 void wxBell()
 {
     gdk_beep();
 }

+#endif

 
 /* Don't synthesize KeyUp events holding down a key and producing
    KeyDown events with autorepeat. */
 
 /* 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 69f73141b683bd5523897bf1d0c81c7663124ba0..39bd7eaa5718cee6b37914b715b0d021c8552c6f 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -56,11 +56,14 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------

+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library

 
 void wxBell()
 {
     gdk_beep();
 }
 
 void wxBell()
 {
     gdk_beep();
 }

+#endif

 
 /* Don't synthesize KeyUp events holding down a key and producing
    KeyDown events with autorepeat. */
 
 /* 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 b14765332d650d08c20e2b92d4825d5bf4b7465e..77bdbe3d6bb5a82358cd46a7fe74aec3dd81091b 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -127,11 +127,14 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 // ----------------------------------------------------------------------------
 
 // Emit a beeeeeep
 // ----------------------------------------------------------------------------
 
 // 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);
 }
 void wxBell()
 {
     // Use current setting for the bell
     XBell (wxGlobalDisplay(), 0);
 }

+#endif

 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index 8221b954310f8dcc9f5307217c33a5f65329d196..604a87e828392ce7cd4e55ef957ff05b71f74a24 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -92,11 +92,14 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 // ----------------------------------------------------------------------------
 
 // Emit a beeeeeep
 // ----------------------------------------------------------------------------
 
 // 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);
 }
 void wxBell()
 {
     // Use current setting for the bell
     XBell ((Display*) wxGetDisplay(), 0);
 }

+#endif

 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
 
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {