fix wxGTK1 compilation after wxTextEntry DoGetValue() change

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

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 79b35d5370056078e090e7d18a09ebda929fd615..96cf13130b6c7cc2f588bd3670f8a8e7f869a2c6 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -26,7 +26,7 @@
     #include "wx/timer.h"
 #endif // !PCH
 
     #include "wx/timer.h"
 #endif // !PCH
 

-#include "wx/filefn.h"
+#include "wx/filename.h"

 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/crt.h"
 #include "wx/ffile.h"
 #include "wx/process.h"
 #include "wx/crt.h"


@@ -43,8 +43,8 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 #include <errno.h>
 

-DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED)
-DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED)
+wxDEFINE_EVENT( wxEVT_DIALUP_CONNECTED, wxDialUpEvent );
+wxDEFINE_EVENT( wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent );

 
 // ----------------------------------------------------------------------------
 // A class which groups functions dealing with connecting to the network from a
 
 // ----------------------------------------------------------------------------
 // A class which groups functions dealing with connecting to the network from a


@@ -673,7 +673,7 @@ wxDialUpManagerImpl::CheckIfconfig()
         wxASSERT_MSG( m_IfconfigPath.length(),
                       _T("can't use ifconfig if it wasn't found") );
 
         wxASSERT_MSG( m_IfconfigPath.length(),
                       _T("can't use ifconfig if it wasn't found") );
 

-        wxString tmpfile = wxGetTempFileName( wxT("_wxdialuptest") );
+        wxString tmpfile = wxFileName::CreateTempFileName( wxT("_wxdialuptest") );

         wxString cmd = wxT("/bin/sh -c \'");
         cmd << m_IfconfigPath;
 #if defined(__AIX__) || \
         wxString cmd = wxT("/bin/sh -c \'");
         cmd << m_IfconfigPath;
 #if defined(__AIX__) || \


@@ -721,8 +721,8 @@ wxDialUpManagerImpl::CheckIfconfig()
 
 #if defined(__SOLARIS__) || defined (__SUNOS__)
                     // dialup device under SunOS/Solaris
 
 #if defined(__SOLARIS__) || defined (__SUNOS__)
                     // dialup device under SunOS/Solaris

-                    hasModem = strstr(output.fn_str(),"ipdptp") != (char *)NULL;
-                    hasLAN = strstr(output.fn_str(), "hme") != (char *)NULL;
+                    hasModem = strstr(output.fn_str(),"ipdptp") != NULL;
+                    hasLAN = strstr(output.fn_str(), "hme") != NULL;

 #elif defined(__LINUX__) || defined (__FREEBSD__)
                     hasModem = strstr(output.fn_str(),"ppp")    // ppp
                         || strstr(output.fn_str(),"sl")  // slip
 #elif defined(__LINUX__) || defined (__FREEBSD__)
                     hasModem = strstr(output.fn_str(),"ppp")    // ppp
                         || strstr(output.fn_str(),"sl")  // slip