Disable handling of wxEVT_MOUSEWHEEL in wxVarScrollHelperEvtHandler in wxGTK.

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 383a5d088bbeb964ce39e1ec07a418c203e93258..8d6eb49aa27cbe73fcd105fc815b0644c72284a8 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/1997
-// RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -251,7 +250,7 @@ bool wxURL::FetchProtocol()
     {
         if (m_scheme == info->m_protoname)
         {
-            if (m_port.IsNull())
+            if ( m_port.empty() )
                 m_port = info->m_servname;
             m_protoinfo = info;
             m_protocol = (wxProtocol *)m_protoinfo->m_cinfo->CreateObject();
@@ -365,8 +364,7 @@ void wxURL::SetDefaultProxy(const wxString& url_proxy)
         if ( ms_proxyDefault )
         {
             ms_proxyDefault->Close();
-            delete ms_proxyDefault;
-            ms_proxyDefault = NULL;
+            wxDELETE(ms_proxyDefault);
         }
     }
     else
@@ -487,8 +485,7 @@ bool wxURLModule::OnInit()
 void wxURLModule::OnExit()
 {
 #if wxUSE_PROTOCOL_HTTP
-    delete wxURL::ms_proxyDefault;
-    wxURL::ms_proxyDefault = NULL;
+    wxDELETE(wxURL::ms_proxyDefault);
 #endif // wxUSE_PROTOCOL_HTTP
 }