Applied some of the SGI fixes. Don't know about the

    toolbar one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 49567d13271f8c6c16e938d6c48b828d4766fb10..8d3112b6a43f763484373648389df3075a65d73e 100644 (file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -75,7 +75,8 @@ wxDateTime& wxDateTime::Set(time_t timet)
 
 wxDateTime& wxDateTime::SetToCurrent()
 {
-    return *this = Now();
+    *this = Now();
+    return *this;
 }
 
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 5fd1016b5f3b0801fe2330aeebb14c156c1f30a3..d85b5420fb4b017f5316c7ff7e3a9be8cd85bd45 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -591,7 +591,9 @@ wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
 
     Divide(ll, quotient, remainder);
 
-    return *this = quotient;
+    *this = quotient;
+    
+    return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const

diff --git a/src/unix/dialup.cpp b/src/unix/dialup.cpp
index 1e2154ce5eef5767ba8e2577b67cf0162adac5b7..5bbfd306d0a739c30ca6e6a8e5d0007e3bb2c54f 100644 (file)
--- a/src/unix/dialup.cpp
+++ b/src/unix/dialup.cpp
@@ -566,7 +566,7 @@ wxDialUpManagerImpl::CheckIfconfig(void)
                     || strstr(output,"sl")  // slip
                     || strstr(output,"pl"); // plip
 #elif defined(__SGI__)  // IRIX
-               rc = strstr(output, "ppp"); // PPP
+               rc = (int) strstr(output, "ppp"); // PPP
 #elif defined(__HPUX__)
                // if could run ifconfig on interface, then it exists
                rc = TRUE;