X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..dbe0872fc80f7fc9ac37235ab1f8ba8224b0bfa5:/src/common/hyperlnkcmn.cpp diff --git a/src/common/hyperlnkcmn.cpp b/src/common/hyperlnkcmn.cpp index 8c623073fe..7765e21d8b 100644 --- a/src/common/hyperlnkcmn.cpp +++ b/src/common/hyperlnkcmn.cpp @@ -43,7 +43,7 @@ // ============================================================================ IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent) -wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent ); const char wxHyperlinkCtrlNameStr[] = "hyperlink"; @@ -51,9 +51,12 @@ const char wxHyperlinkCtrlNameStr[] = "hyperlink"; // wxHyperlinkCtrlBase // ---------------------------------------------------------------------------- -#ifdef __WXDEBUG__ -void wxHyperlinkCtrlBase::CheckParams(const wxString& label, const wxString& url, long style) +void +wxHyperlinkCtrlBase::CheckParams(const wxString& label, + const wxString& url, + long style) { +#if wxDEBUG_LEVEL wxASSERT_MSG(!url.empty() || !label.empty(), wxT("Both URL and label are empty ?")); @@ -62,16 +65,24 @@ void wxHyperlinkCtrlBase::CheckParams(const wxString& label, const wxString& url (int)((style & wxHL_ALIGN_RIGHT) != 0); wxASSERT_MSG(alignment == 1, wxT("Specify exactly one align flag!")); +#else // !wxDEBUG_LEVEL + wxUnusedVar(label); + wxUnusedVar(url); + wxUnusedVar(style); +#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL } -#endif void wxHyperlinkCtrlBase::SendEvent() { wxString url = GetURL(); wxHyperlinkEvent linkEvent(this, GetId(), url); if (!GetEventHandler()->ProcessEvent(linkEvent)) // was the event skipped ? + { if (!wxLaunchDefaultBrowser(url)) + { wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str()); + } + } } #endif // wxUSE_HYPERLINKCTRL