Move wxBell() from base to core library.

This allows to get rid of ugly preprocessor checks due to the fact that this
function could be defined in one or the other library depending on the port
used and also fix a problem with it being defined differently in the base
library depending on which GUI port (Carbon or Cocoa) was used under OS X.
It also fixes the problem with wxBell() in wxGTK under Windows.

Closes #14406.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 8ef0cff3b07736a9ee045fea83669d4abafac7f0..c131fbb9ce71d73ac01ff9e6f3163264013bf597 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -130,12 +130,7 @@ wxDEPRECATED_INLINE(inline bool wxStringEq(const wchar_t *s1, const wchar_t *s2)
 // ----------------------------------------------------------------------------
 
 // Sound the bell
 // ----------------------------------------------------------------------------
 
 // Sound the bell

-#if !defined __EMX__ && \
-    (defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__)

 WXDLLIMPEXP_CORE void wxBell();
 WXDLLIMPEXP_CORE void wxBell();

-#else
-WXDLLIMPEXP_BASE void wxBell();
-#endif

 
 #if wxUSE_MSGDLG
 // Show wxWidgets information
 
 #if wxUSE_MSGDLG
 // Show wxWidgets information

diff --git a/interface/wx/utils.h b/interface/wx/utils.h
index 355f4d60ccbfa02789f66525fbd701a23a26c265..a7eae5dfd875bf5ce29f5d62cd1f7a90c920997f 100644 (file)
--- a/interface/wx/utils.h
+++ b/interface/wx/utils.h
@@ -192,6 +192,8 @@ bool wxIsBusy();
     @note This function is categorized as a GUI one and so is not thread-safe.
 
     @header{wx/utils.h}
     @note This function is categorized as a GUI one and so is not thread-safe.
 
     @header{wx/utils.h}

+
+    @library{wxcore}

 */
 void wxBell();
 
 */
 void wxBell();
 

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 30ce5c732ebb9b428fe6e2ecc8e80a766aa56b14..6293a68ddf089c9eb6a3fd66cb697b940bb27e0b 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -66,14 +66,11 @@ 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

 
 // ----------------------------------------------------------------------------
 // display characterstics
 
 // ----------------------------------------------------------------------------
 // display characterstics

diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp
index f49cf649317db884c87ea051781d94013d0d5345..86a866c0f6de942770713e8f03a1de507d826976 100644 (file)
--- a/src/gtk1/utilsgtk.cpp
+++ b/src/gtk1/utilsgtk.cpp
@@ -58,14 +58,11 @@ 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 5fd3aeefb82b51b18d5743f1d06f97d7424923b0..ec1095d283926617aafafd72b5000c8ae1276649 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -112,14 +112,11 @@ int wxGUIAppTraits::AddProcessCallback(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

 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {
 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 292efc5dd1f4fb6464965f65585b42f5857a9cad..abab0a651a9490a98b5c12d908935842fc88c1df 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1076,12 +1076,6 @@ unsigned long wxGetProcessId()
     return ::GetCurrentProcessId();
 }
 
     return ::GetCurrentProcessId();
 }
 

-// Emit a beeeeeep
-void wxBell()
-{
-    ::MessageBeep((UINT)-1);        // default sound
-}
-

 bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS
 bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index c18e1eaf59971c4aa15da056cc0c2073fb904e7e..b2cce08f54398722b8490e348333f61fa60faec1 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -41,6 +41,12 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// Emit a beeeeeep
+void wxBell()
+{
+    ::MessageBeep((UINT)-1);        // default sound
+}
+

 // ---------------------------------------------------------------------------
 // helper functions for showing a "busy" cursor
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // helper functions for showing a "busy" cursor
 // ---------------------------------------------------------------------------

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index adf5aab3da68a2a7b1e79ffded61e871b161f2d4..66af86b3e842b6b9d29694c48d02aef8063472b0 100644 (file)
--- a/src/os2/utils.cpp
+++ b/src/os2/utils.cpp
@@ -306,12 +306,6 @@ void wxFlushEvents()
 //  wxYield();
 }
 
 //  wxYield();
 }
 

-// Emit a beeeeeep
-void wxBell()
-{
-    DosBeep(1000,1000); // 1kHz during 1 sec.
-}
-

 wxString wxGetOsDescription()
 {
     wxString strVer(wxT("OS/2"));
 wxString wxGetOsDescription()
 {
     wxString strVer(wxT("OS/2"));

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index eca34900b8b667073b13f7719084a668576237d3..12aec216ba74fb6a8591610ecf6988a00ea79462 100644 (file)
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -42,6 +42,12 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// Emit a beeeeeep
+void wxBell()
+{
+    DosBeep(1000,1000); // 1kHz during 1 sec.
+}
+

 // ----------------------------------------------------------------------------
 // functions to work with .INI files
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // functions to work with .INI files
 // ----------------------------------------------------------------------------

diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp
index f70317895ff3eb161605699b138da2e298c79940..2d2b5ccdf9b7e781cba7fa025c79062d8d87ae88 100644 (file)
--- a/src/osx/carbon/utils.cpp
+++ b/src/osx/carbon/utils.cpp
@@ -45,7 +45,7 @@
 
 #include "wx/evtloop.h"
 
 
 #include "wx/evtloop.h"
 

-#if wxUSE_BASE
+#if wxUSE_GUI

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -63,10 +63,6 @@ void wxBell()
 #endif
 }
 
 #endif
 }
 

-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-

 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);
 wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
 {
     return new wxOSXTimerImpl(timer);

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 4a4c1e0c33e1d4341f39670f172627fc0111b407..c2c83699409aa287543ee586abb6648b2ef50007 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -37,7 +37,7 @@
 
 #if wxOSX_USE_COCOA
 
 
 #if wxOSX_USE_COCOA
 

-#if wxUSE_BASE
+#if wxUSE_GUI

 
 // Emit a beeeeeep
 void wxBell()
 
 // Emit a beeeeeep
 void wxBell()


@@ -45,10 +45,6 @@ void wxBell()
     NSBeep();
 }
 
     NSBeep();
 }
 

-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-

 @implementation wxNSAppController
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application { 
 @implementation wxNSAppController
 
 - (void)applicationWillFinishLaunching:(NSNotification *)application { 

diff --git a/src/osx/iphone/utils.mm b/src/osx/iphone/utils.mm
index f453992216acc728fdcc066dd1fe8b2f271d4260..cd21d51fb9244c06fde7791a766f4a76dbf5226f 100644 (file)
--- a/src/osx/iphone/utils.mm
+++ b/src/osx/iphone/utils.mm
@@ -39,13 +39,6 @@
 
 #if 1 // wxUSE_BASE
 
 
 #if 1 // wxUSE_BASE
 

-// Emit a beeeeeep
-void wxBell()
-{
-    // would be kSystemSoundID_UserPreferredAlert but since the headers aren't correct, add it manually
-    AudioServicesPlayAlertSound(0x00001000 );
-}
-

 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------


@@ -91,6 +84,13 @@ void wxApp::DoCleanUp()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+// Emit a beeeeeep
+void wxBell()
+{
+    // would be kSystemSoundID_UserPreferredAlert but since the headers aren't correct, add it manually
+    AudioServicesPlayAlertSound(0x00001000 );
+}
+

 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------

diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index c32f5c62c98fa7a08ff3f272f3503e0f4945e80c..688756efef46181d9ad55ab5302bb201c51c1ac5 100644 (file)
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -94,14 +94,11 @@ bool wxCheckForInterrupt(wxWindow *WXUNUSED(wnd))
 // ----------------------------------------------------------------------------
 
 // 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

 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {
 
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
 {