Derive wxWebViewEvent from wxNotifyEvent.

[wxWidgets.git] / src / unix / net.cpp

diff --git a/src/unix/net.cpp b/src/unix/net.cpp
index ab4936b94623aaa4f548cb99e662821066bde9ac..268eb46b06bf39b2f21bfb84bd2be7d419eb6cec 100644 (file)
--- a/src/unix/net.cpp
+++ b/src/unix/net.cpp
@@ -1,5 +1,5 @@
 // -*- c++ -*- ///////////////////////////////////////////////////////////////
 // -*- c++ -*- ///////////////////////////////////////////////////////////////

-// Name:        unix/net.cpp
+// Name:        src/unix/net.cpp

 // Purpose:     Network related wxWindows classes and functions
 // Author:      Karsten Ballüder
 // Modified by:
 // Purpose:     Network related wxWindows classes and functions
 // Author:      Karsten Ballüder
 // Modified by:


@@ -236,8 +236,7 @@ wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds)
    bool rc = m_timer->Start(nSeconds*1000);
    if(! rc)
    {
    bool rc = m_timer->Start(nSeconds*1000);
    if(! rc)
    {

-      delete m_timer;
-      m_timer = NULL;
+      wxDELETE(m_timer);

    }
    return rc;
 }
    }
    return rc;
 }


@@ -247,8 +246,7 @@ wxDialUpManagerImpl::DisableAutoCheckOnlineStatus()
 {
    wxASSERT(m_timer != NULL);
    m_timer->Stop();
 {
    wxASSERT(m_timer != NULL);
    m_timer->Stop();

-   delete m_timer;
-   m_timer = NULL;
+   wxDELETE(m_timer);

 }
 
 
 }
 
 


@@ -257,15 +255,15 @@ wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
 {
    /// does hostname contain a port number?
    wxString port = hostname.After(':');
 {
    /// does hostname contain a port number?
    wxString port = hostname.After(':');

-   if(port.Length())
+   if(port.empty())

    {
    {

-      m_BeaconHost = hostname.Before(':');
-      m_BeaconPort = atoi(port);
+      m_BeaconHost = hostname;
+      m_BeaconPort = portno;

    }
    else
    {
    }
    else
    {

-      m_BeaconHost = hostname;
-      m_BeaconPort = portno;
+      m_BeaconHost = hostname.Before(':');
+      m_BeaconPort = atoi(port);

    }
 }
 
    }
 }
 


@@ -321,7 +319,7 @@ wxDialUpManagerImpl::CheckStatusInternal(void)
    // Let's try the ifconfig method first, should be fastest:
    if(m_CanUseIfconfig != 0) // unknown or yes
    {
    // Let's try the ifconfig method first, should be fastest:
    if(m_CanUseIfconfig != 0) // unknown or yes
    {

-      wxASSERT(m_IfconfigPath.length());
+      wxASSERT( !m_IfconfigPath.empty() );

 
       wxString tmpfile = wxFileName::CreateTempFileName("_wxdialuptest");
       wxString cmd = "/bin/sh -c \'";
 
       wxString tmpfile = wxFileName::CreateTempFileName("_wxdialuptest");
       wxString cmd = "/bin/sh -c \'";