Added wxVector::swap().

[wxWidgets.git] / src / common / hyperlnkcmn.cpp

diff --git a/src/common/hyperlnkcmn.cpp b/src/common/hyperlnkcmn.cpp
index 8c623073fe72229245cf1da0b3c279651194c53a..7765e21d8b7887e5a76f4512dc7f4d382f176e58 100644 (file)
--- a/src/common/hyperlnkcmn.cpp
+++ b/src/common/hyperlnkcmn.cpp
@@ -43,7 +43,7 @@
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkEvent, wxCommandEvent)

-wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEvent );

 
 const char wxHyperlinkCtrlNameStr[] = "hyperlink";
 
 
 const char wxHyperlinkCtrlNameStr[] = "hyperlink";
 


@@ -51,9 +51,12 @@ const char wxHyperlinkCtrlNameStr[] = "hyperlink";
 // wxHyperlinkCtrlBase
 // ----------------------------------------------------------------------------
 
 // 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 ?"));
 
     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!"));
                     (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 ?
 
 void wxHyperlinkCtrlBase::SendEvent()
 {
     wxString url = GetURL();
     wxHyperlinkEvent linkEvent(this, GetId(), url);
     if (!GetEventHandler()->ProcessEvent(linkEvent))     // was the event skipped ?

+    {

         if (!wxLaunchDefaultBrowser(url))
         if (!wxLaunchDefaultBrowser(url))

+        {

             wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str());
             wxLogWarning(wxT("Could not launch the default browser with url '%s' !"), url.c_str());

+        }
+    }

 }
 
 #endif // wxUSE_HYPERLINKCTRL
 }
 
 #endif // wxUSE_HYPERLINKCTRL