Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/unix/net.cpp b/src/unix/net.cpp
index 194f58e6eaf1cd89efdb755ffb70061cdf6212ef..3125aadc2cef7aee8aff5dd5c73afa3a6d78f108 100644 (file)
--- a/src/unix/net.cpp
+++ b/src/unix/net.cpp
@@ -1,10 +1,9 @@
 // -*- c++ -*- ///////////////////////////////////////////////////////////////
 // -*- c++ -*- ///////////////////////////////////////////////////////////////

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

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

-// RCS-ID:      $Id$

 // Copyright:   (c) Karsten Ballüder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Karsten Ballüder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -79,7 +78,7 @@ public:
        wxDialUpManager methods.
    */
    virtual bool IsOk() const
        wxDialUpManager methods.
    */
    virtual bool IsOk() const

-      { return TRUE; }
+      { return true; }

 
    /** The simplest way to initiate a dial up: this function dials the given
        ISP (exact meaning of the parameter depends on the platform), returns
 
    /** The simplest way to initiate a dial up: this function dials the given
        ISP (exact meaning of the parameter depends on the platform), returns


@@ -112,7 +111,7 @@ public:
    // so, in general, the user should be allowed to override it. This function
    // allows to forcefully set the online status - whatever our internal
    // algorithm may think about it.
    // so, in general, the user should be allowed to override it. This function
    // allows to forcefully set the online status - whatever our internal
    // algorithm may think about it.

-   virtual void SetOnlineStatus(bool isOnline = TRUE)
+   virtual void SetOnlineStatus(bool isOnline = true)

       { m_IsOnline = isOnline; }
 
    // set misc wxDialUpManager options
       { m_IsOnline = isOnline; }
 
    // set misc wxDialUpManager options


@@ -180,11 +179,11 @@ public:
    AutoCheckTimer(wxDialUpManagerImpl *dupman)
       {
          m_dupman = dupman;
    AutoCheckTimer(wxDialUpManagerImpl *dupman)
       {
          m_dupman = dupman;

-         m_started = FALSE;
+         m_started = false;

       }
 
    virtual bool Start( int millisecs = -1 )
       }
 
    virtual bool Start( int millisecs = -1 )

-      { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
+      { m_started = true; return wxTimer::Start(millisecs, false); }

 
    virtual void Notify()
       { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
 
    virtual void Notify()
       { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }


@@ -202,7 +201,7 @@ wxDialUpManagerImpl::Dial(const wxString &isp,
                           const wxString & WXUNUSED(password))
 {
    if(m_IsOnline == 1)
                           const wxString & WXUNUSED(password))
 {
    if(m_IsOnline == 1)

-      return FALSE;
+      return false;

    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;
    m_IsOnline = -1;
    m_ISPname = isp;
    wxString cmd;


@@ -217,7 +216,7 @@ bool
 wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)
 wxDialUpManagerImpl::HangUp(void)
 {
    if(m_IsOnline == 0)

-      return FALSE;
+      return false;

    m_IsOnline = -1;
    wxString cmd;
    if(m_HangUpCommand.Find("%s"))
    m_IsOnline = -1;
    wxString cmd;
    if(m_HangUpCommand.Find("%s"))


@@ -236,8 +235,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 +245,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 +254,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 +318,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 \'";