added assignment operators from int for disambiguation of expressions such as ll=0

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

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 69b6c4ca477154ab70877313b1b783fd9661a3bd..366ba7270f1e0267b5f60e4f4b80ce6679418912 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -134,6 +134,8 @@ public:
     wxLongLongNative& operator=(wxULongLong_t ll)
         { m_ll = ll; return *this; }
     wxLongLongNative& operator=(const wxULongLongNative &ll);
     wxLongLongNative& operator=(wxULongLong_t ll)
         { m_ll = ll; return *this; }
     wxLongLongNative& operator=(const wxULongLongNative &ll);

+    wxLongLongNative& operator=(int l)
+        { m_ll = l; return *this; }

     wxLongLongNative& operator=(long l)
         { m_ll = l; return *this; }
     wxLongLongNative& operator=(unsigned long l)
     wxLongLongNative& operator=(long l)
         { m_ll = l; return *this; }
     wxLongLongNative& operator=(unsigned long l)


@@ -365,6 +367,8 @@ public:
         { m_ll = ll; return *this; }
     wxULongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }
         { m_ll = ll; return *this; }
     wxULongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }

+    wxULongLongNative& operator=(int l)
+        { m_ll = l; return *this; }

     wxULongLongNative& operator=(long l)
         { m_ll = l; return *this; }
     wxULongLongNative& operator=(unsigned long l)
     wxULongLongNative& operator=(long l)
         { m_ll = l; return *this; }
     wxULongLongNative& operator=(unsigned long l)


@@ -606,6 +610,12 @@ public:
 
         return *this;
     }
 
         return *this;
     }

+        // from int
+    wxLongLongWx& operator=(int l)
+    {
+        return operator=((long)l);
+    }
+

     wxLongLongWx& operator=(unsigned long l)
     {
         m_lo = l;
     wxLongLongWx& operator=(unsigned long l)
     {
         m_lo = l;