Decided I need copy and assignment afterall
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -148,9 +148,9 @@ public:
 | 
				
			|||||||
    ~wxMemoryBuffer() { free(m_data); }
 | 
					    ~wxMemoryBuffer() { free(m_data); }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Accessors
 | 
					    // Accessors
 | 
				
			||||||
    void*  GetData()    { return m_data; }
 | 
					    void*  GetData() const    { return m_data; }
 | 
				
			||||||
    size_t GetBufSize() { return m_size; }
 | 
					    size_t GetBufSize() const { return m_size; }
 | 
				
			||||||
    size_t GetDataLen() { return m_len; }
 | 
					    size_t GetDataLen() const { return m_len; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void   SetBufSize(size_t size) { ResizeIfNeeded(size); }
 | 
					    void   SetBufSize(size_t size) { ResizeIfNeeded(size); }
 | 
				
			||||||
    void   SetDataLen(size_t len)
 | 
					    void   SetDataLen(size_t len)
 | 
				
			||||||
@@ -179,7 +179,7 @@ public:
 | 
				
			|||||||
    // Other ways to append to the buffer
 | 
					    // Other ways to append to the buffer
 | 
				
			||||||
    void  AppendByte(char data) {
 | 
					    void  AppendByte(char data) {
 | 
				
			||||||
        ResizeIfNeeded(m_len + 1);
 | 
					        ResizeIfNeeded(m_len + 1);
 | 
				
			||||||
        *((char*)m_data) = data;
 | 
					        *(((char*)m_data)+m_len) = data;
 | 
				
			||||||
        m_len += 1;
 | 
					        m_len += 1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    void  AppendData(void* data, size_t len)
 | 
					    void  AppendData(void* data, size_t len)
 | 
				
			||||||
@@ -190,6 +190,35 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    operator const char *() const { return (const char*)m_data; }
 | 
					    operator const char *() const { return (const char*)m_data; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Copy and assignment
 | 
				
			||||||
 | 
					    wxMemoryBuffer(const wxMemoryBuffer& src)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        m_data = src.m_data;
 | 
				
			||||||
 | 
					        m_size = src.m_size;
 | 
				
			||||||
 | 
					        m_len  = src.m_len;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // no reference count yet...
 | 
				
			||||||
 | 
					        ((wxMemoryBuffer*)&src)->m_data = NULL;
 | 
				
			||||||
 | 
					        ((wxMemoryBuffer*)&src)->m_size = 0;
 | 
				
			||||||
 | 
					        ((wxMemoryBuffer*)&src)->m_len  = 0;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    wxMemoryBuffer& operator=(const wxMemoryBuffer& src)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        m_data = src.m_data;
 | 
				
			||||||
 | 
					        m_size = src.m_size;
 | 
				
			||||||
 | 
					        m_len  = src.m_len;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // no reference count yet...
 | 
				
			||||||
 | 
					        ((wxMemoryBuffer*)&src)->m_data = NULL;
 | 
				
			||||||
 | 
					        ((wxMemoryBuffer*)&src)->m_size = 0;
 | 
				
			||||||
 | 
					        ((wxMemoryBuffer*)&src)->m_len  = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        return *this;
 | 
				
			||||||
 | 
					   }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
protected:
 | 
					protected:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void ResizeIfNeeded(size_t newSize)
 | 
					    void ResizeIfNeeded(size_t newSize)
 | 
				
			||||||
@@ -202,8 +231,6 @@ protected:
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    DECLARE_NO_COPY_CLASS(wxMemoryBuffer)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
    void*       m_data;
 | 
					    void*       m_data;
 | 
				
			||||||
    size_t      m_size;
 | 
					    size_t      m_size;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user