Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/buffer.h b/include/wx/buffer.h
index d9640e25c040ea98758d3a5dce5d5d154a7742f6..951777a13c47fd9fe74544ebf843056fde0c812c 100644 (file)
--- a/include/wx/buffer.h
+++ b/include/wx/buffer.h
@@ -15,9 +15,7 @@
 #include "wx/chartype.h"
 #include "wx/wxcrtbase.h"
 
 #include "wx/chartype.h"
 #include "wx/wxcrtbase.h"
 

-#ifndef __WXPALMOS5__

 #include <stdlib.h>             // malloc() and free()
 #include <stdlib.h>             // malloc() and free()

-#endif // ! __WXPALMOS5__

 
 class WXDLLIMPEXP_FWD_BASE wxCStrData;
 
 
 class WXDLLIMPEXP_FWD_BASE wxCStrData;
 


@@ -95,7 +93,7 @@ public:
     // Creates "owned" buffer, i.e. takes over ownership of 'str' and frees it
     // in dtor (if ref.count reaches 0).
     static
     // Creates "owned" buffer, i.e. takes over ownership of 'str' and frees it
     // in dtor (if ref.count reaches 0).
     static

-    const wxScopedCharTypeBuffer CreateOwned(const CharType *str,
+    const wxScopedCharTypeBuffer CreateOwned(CharType *str,

                                              size_t len = wxNO_LEN )
     {
         if ( len == wxNO_LEN )
                                              size_t len = wxNO_LEN )
     {
         if ( len == wxNO_LEN )


@@ -103,7 +101,7 @@ public:
 
         wxScopedCharTypeBuffer buf;
         if ( str )
 
         wxScopedCharTypeBuffer buf;
         if ( str )

-            buf.m_data = new Data(StrCopy(str, len), len);
+            buf.m_data = new Data(str, len);

         return buf;
     }
 
         return buf;
     }
 


@@ -232,7 +230,8 @@ protected:
     static CharType *StrCopy(const CharType *src, size_t len)
     {
         CharType *dst = (CharType*)malloc(sizeof(CharType) * (len + 1));
     static CharType *StrCopy(const CharType *src, size_t len)
     {
         CharType *dst = (CharType*)malloc(sizeof(CharType) * (len + 1));

-        memcpy(dst, src, sizeof(CharType) * (len + 1));
+        if ( dst )
+            memcpy(dst, src, sizeof(CharType) * (len + 1));

         return dst;
     }
 
         return dst;
     }
 


@@ -260,7 +259,7 @@ public:
         {
             if ( len == wxNO_LEN )
                 len = wxStrlen(str);
         {
             if ( len == wxNO_LEN )
                 len = wxStrlen(str);

-            this->m_data = new Data(StrCopy(str, len), len);
+            this->m_data = new Data(this->StrCopy(str, len), len);

         }
         else
         {
         }
         else
         {


@@ -295,7 +294,7 @@ public:
 
     wxCharTypeBuffer(const wxScopedCharTypeBuffer<T>& src)
     {
 
     wxCharTypeBuffer(const wxScopedCharTypeBuffer<T>& src)
     {

-        MakeOwnedCopyOf(src);
+        this->MakeOwnedCopyOf(src);

     }
 
     wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer<T>& src)
     }
 
     wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer<T>& src)


@@ -314,6 +313,10 @@ public:
         if ( !str )
             return false;
 
         if ( !str )
             return false;
 

+        // For consistency with the ctor taking just the length, NUL-terminate
+        // the buffer.
+        str[len] = (CharType)0;
+

         if ( this->m_data == this->GetNullData() )
         {
             this->m_data = new Data(str, len);
         if ( this->m_data == this->GetNullData() )
         {
             this->m_data = new Data(str, len);


@@ -436,7 +439,7 @@ public:
 
     friend class wxMemoryBuffer;
 
 
     friend class wxMemoryBuffer;
 

-    // everyting is private as it can only be used by wxMemoryBuffer
+    // everything is private as it can only be used by wxMemoryBuffer

 private:
     wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize)
         : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0)
 private:
     wxMemoryBufferData(size_t size = wxMemoryBufferData::DefBufSize)
         : m_data(size ? malloc(size) : NULL), m_size(size), m_len(0), m_ref(0)


@@ -468,6 +471,21 @@ private:
             delete this;
     }
 
             delete this;
     }
 

+    void *release()
+    {
+        if ( m_data == NULL )
+            return NULL;
+
+        wxASSERT_MSG( m_ref == 1, "can't release shared buffer" );
+
+        void *p = m_data;
+        m_data = NULL;
+        m_len =
+        m_size = 0;
+
+        return p;
+    }
+

 
     // the buffer containing the data
     void  *m_data;
 
     // the buffer containing the data
     void  *m_data;


@@ -522,6 +540,8 @@ public:
     size_t GetBufSize() const { return m_bufdata->m_size; }
     size_t GetDataLen() const { return m_bufdata->m_len; }
 
     size_t GetBufSize() const { return m_bufdata->m_size; }
     size_t GetDataLen() const { return m_bufdata->m_len; }
 

+    bool IsEmpty() const { return GetDataLen() == 0; }
+

     void   SetBufSize(size_t size) { m_bufdata->ResizeIfNeeded(size); }
     void   SetDataLen(size_t len)
     {
     void   SetBufSize(size_t size) { m_bufdata->ResizeIfNeeded(size); }
     void   SetDataLen(size_t len)
     {


@@ -529,6 +549,8 @@ public:
         m_bufdata->m_len = len;
     }
 
         m_bufdata->m_len = len;
     }
 

+    void Clear() { SetDataLen(0); }
+

     // Ensure the buffer is big enough and return a pointer to it
     void *GetWriteBuf(size_t sizeNeeded)
     {
     // Ensure the buffer is big enough and return a pointer to it
     void *GetWriteBuf(size_t sizeNeeded)
     {


@@ -570,6 +592,13 @@ public:
 
     operator const char *() const { return (const char*)GetData(); }
 
 
     operator const char *() const { return (const char*)GetData(); }
 

+    // gives up ownership of data, returns the pointer; after this call,
+    // data isn't freed by the buffer and its content is resent to empty
+    void *release()
+    {
+        return m_bufdata->release();
+    }
+

 private:
     wxMemoryBufferData*  m_bufdata;
 };
 private:
     wxMemoryBufferData*  m_bufdata;
 };