wxTextDataObject now uses Unicode if compiled with wxUSE_UNICODE.
Fixed wxURLDataObject in MSW. Added GetSizeFromBuffer, SetSizeInBuffer, GetBufferOffset to wxDataObject as per Vadim's suggestion. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -273,6 +273,13 @@ public:
|
||||
protected:
|
||||
// returns the pointer to the object which supports this format or NULL
|
||||
wxDataObjectSimple *GetObject(const wxDataFormat& format) const;
|
||||
#if defined(__WXMSW__)
|
||||
virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
|
||||
const wxDataFormat& format );
|
||||
virtual void* SetSizeInBuffer( void* buffer, size_t size,
|
||||
const wxDataFormat& format );
|
||||
virtual size_t GetBufferOffset( const wxDataFormat& format );
|
||||
#endif
|
||||
|
||||
private:
|
||||
// the list of all (simple) data objects whose formats we support
|
||||
@@ -301,7 +308,8 @@ public:
|
||||
// ctor: you can specify the text here or in SetText(), or override
|
||||
// GetText()
|
||||
wxTextDataObject(const wxString& text = wxEmptyString)
|
||||
: wxDataObjectSimple(wxDF_TEXT), m_text(text)
|
||||
: wxDataObjectSimple(wxUSE_UNICODE?wxDF_UNICODETEXT:wxDF_TEXT),
|
||||
m_text(text)
|
||||
{
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user