show busy cursor in wxLaunchDefaultBrowser and add a new flag to avoid it (#9678)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -940,7 +940,7 @@ void wxQsort(void *const pbase, size_t total_elems,
|
||||
bool wxLaunchDefaultApplication(const wxString &document, int flags)
|
||||
{
|
||||
wxUnusedVar(flags);
|
||||
|
||||
|
||||
#ifdef __UNIX__
|
||||
// Our best best is to use xdg-open from freedesktop.org cross-desktop
|
||||
// compatibility suite xdg-utils
|
||||
@@ -968,7 +968,7 @@ bool wxLaunchDefaultApplication(const wxString &document, int flags)
|
||||
bool wxCocoaLaunchDefaultBrowser(const wxString& url, int flags);
|
||||
#endif
|
||||
|
||||
bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
|
||||
static bool DoLaunchDefaultBrowser(const wxString& urlOrig, int flags)
|
||||
{
|
||||
wxUnusedVar(flags);
|
||||
|
||||
@@ -1176,6 +1176,15 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
|
||||
return false;
|
||||
}
|
||||
|
||||
bool wxLaunchDefaultBrowser(const wxString& url, int flags)
|
||||
{
|
||||
if ( flags & wxBROWSER_NOBUSYCURSOR )
|
||||
return DoLaunchDefaultBrowser(url, flags);
|
||||
|
||||
wxBusyCursor bc;
|
||||
return DoLaunchDefaultBrowser(url, flags);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Menu accelerators related functions
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -1492,8 +1501,8 @@ wxString wxGetPasswordFromUser(const wxString& message,
|
||||
|
||||
#if wxUSE_COLOURDLG
|
||||
|
||||
wxColour wxGetColourFromUser(wxWindow *parent,
|
||||
const wxColour& colInit,
|
||||
wxColour wxGetColourFromUser(wxWindow *parent,
|
||||
const wxColour& colInit,
|
||||
const wxString& caption,
|
||||
wxColourData *ptrData)
|
||||
{
|
||||
|
Reference in New Issue
Block a user