Applied patch to add n bitmaps at once to an image

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 5ceca3c77b012523757b8a30bd4183bd1d1ba0f7..59dcd57c7441a249166e71728e4d7461a742cd4f 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -140,6 +140,8 @@ public:
         { m_ll = l; return *this; }
     wxLongLongNative& operator=(long l)
         { m_ll = l; return *this; }
         { m_ll = l; return *this; }
     wxLongLongNative& operator=(long l)
         { m_ll = l; return *this; }

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

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


@@ -375,6 +377,8 @@ public:
         { m_ll = l; return *this; }
     wxULongLongNative& operator=(long l)
         { m_ll = l; return *this; }
         { m_ll = l; return *this; }
     wxULongLongNative& operator=(long l)
         { m_ll = l; return *this; }

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

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


@@ -633,6 +637,12 @@ public:
 
         return *this;
     }
 
         return *this;
     }

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

     wxLongLongWx& operator=(const class wxULongLongWx &ll);
 
     // from double
     wxLongLongWx& operator=(const class wxULongLongWx &ll);
 
     // from double