X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f8218d7ca7c8913bfdf82cad2f7be117a662b0d..5b12cceef870243338e39d4b15536008491de474:/include/wx/utils.h diff --git a/include/wx/utils.h b/include/wx/utils.h index 619ba3c216..db44a049e6 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -90,7 +90,12 @@ wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s) ); // ---------------------------------------------------------------------------- // Sound the bell +#if !defined __EMX__ && \ + (defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__) +WXDLLIMPEXP_CORE void wxBell(); +#else WXDLLIMPEXP_BASE void wxBell(); +#endif // Get OS description as a user-readable string WXDLLIMPEXP_BASE wxString wxGetOsDescription(); @@ -324,7 +329,7 @@ WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true); #endif // wxUSE_ON_FATAL_EXCEPTION -#if wxABI_VERSION > 20601 +#if wxABI_VERSION >= 20601 // Launch url in the user's default internet browser WXDLLIMPEXP_BASE bool wxLaunchDefaultBrowser(const wxString& url); #endif @@ -523,9 +528,9 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y ); #endif #ifdef __X__ - WXDisplay *wxGetDisplay(); - bool wxSetDisplay(const wxString& display_name); - wxString wxGetDisplayName(); + WXDLLIMPEXP_CORE WXDisplay *wxGetDisplay(); + WXDLLIMPEXP_CORE bool wxSetDisplay(const wxString& display_name); + WXDLLIMPEXP_CORE wxString wxGetDisplayName(); #endif // X or GTK+ #ifdef __X__