projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
textctrl impl
[wxWidgets.git]
/
include
/
wx
/
buffer.h
diff --git
a/include/wx/buffer.h
b/include/wx/buffer.h
index 558874d5df73960e1810aae6fdde7a2fbfdbb456..574d0df0734f10abf23767c93be21b1d7fc48935 100644
(file)
--- a/
include/wx/buffer.h
+++ b/
include/wx/buffer.h
@@
-56,12
+56,8
@@
struct UntypedBufferData
bool m_owned;
};
bool m_owned;
};
-// this has to be defined inside the DLL (and not e.g. as a static variable
-// inside an inline function) as otherwise MSVC gives link errors when the
-// functions are effectively inlined (i.e. in non-debug build)
-//
// NB: this is defined in string.cpp and not the (non-existent) buffer.cpp
// NB: this is defined in string.cpp and not the (non-existent) buffer.cpp
-
extern WXDLLIMPEXP_DATA_BASE(UntypedBufferData * const) untypedNullDataPtr
;
+
WXDLLIMPEXP_BASE UntypedBufferData * GetUntypedNullData()
;
} // namespace wxPrivate
} // namespace wxPrivate
@@
-142,8
+138,8
@@
public:
if ( m_data == GetNullData() )
return NULL;
if ( m_data == GetNullData() )
return NULL;
- wxASSERT_MSG( m_data->m_owned,
_
T("can't release non-owned buffer") );
- wxASSERT_MSG( m_data->m_ref == 1,
_
T("can't release shared buffer") );
+ wxASSERT_MSG( m_data->m_owned,
wx
T("can't release non-owned buffer") );
+ wxASSERT_MSG( m_data->m_ref == 1,
wx
T("can't release shared buffer") );
CharType * const p = m_data->Get();
CharType * const p = m_data->Get();
@@
-186,7
+182,7
@@
protected:
// placeholder for NULL string, to simplify this code
static Data *GetNullData()
{
// placeholder for NULL string, to simplify this code
static Data *GetNullData()
{
- return static_cast<Data *>(wxPrivate::
untypedNullDataPtr
);
+ return static_cast<Data *>(wxPrivate::
GetUntypedNullData()
);
}
void IncRef()
}
void IncRef()
@@
-363,7
+359,6
@@
public:
wxCharBuffer(const wxCStrData& cstr);
};
wxCharBuffer(const wxCStrData& cstr);
};
-#if wxUSE_WCHAR_T
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<wchar_t> )
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<wchar_t> )
WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
@@
-383,7
+378,6
@@
public:
wxWCharBuffer(const wxCStrData& cstr);
};
wxWCharBuffer(const wxCStrData& cstr);
};
-#endif // wxUSE_WCHAR_T
// wxCharTypeBuffer<T> implicitly convertible to T*
template <typename T>
// wxCharTypeBuffer<T> implicitly convertible to T*
template <typename T>
@@
-474,6
+468,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;
@@
-561,7
+570,7
@@
public:
// Other ways to append to the buffer
void AppendByte(char data)
{
// Other ways to append to the buffer
void AppendByte(char data)
{
- wxCHECK_RET( m_bufdata->m_data,
_
T("invalid wxMemoryBuffer") );
+ wxCHECK_RET( m_bufdata->m_data,
wx
T("invalid wxMemoryBuffer") );
m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1);
*(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data;
m_bufdata->ResizeIfNeeded(m_bufdata->m_len + 1);
*(((char*)m_bufdata->m_data) + m_bufdata->m_len) = data;
@@
-576,6
+585,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;
};