Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,635 Commits 1 Branch 330 Tags
229f00eb69472782a51a862b5f7e0ad059d906f7
Commit Graph

60 Commits

Author SHA1 Message Date
Vadim Zeitlin
229f00eb69 Translate wxTextDataObject to/from native EOL format. 
The text data should use CR LF EOLs under Windows but the data inside the
program typically has only LF EOLs, so translate between them automatically in
wxTextDataObject.

Closes #14444.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-29 22:08:50 +00:00
Vadim Zeitlin
46a0544e6f No real changes, just use accessors in wxTextDataObject. 
Use {Set,Get}Text() instead of using m_text directly in wxTextDataObject as
these virtual methods overridable and should be called in case the class
doesn't actually use m_text for its storage at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-29 22:08:46 +00:00
Robin Dunn
1dcb50be4a Fix compilation error 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-10 17:09:49 +00:00
Vadim Zeitlin
f421e3f119 Fix wxHTMLDataObject compilation and memory leaks. 
Use wxString::FromUTF8() and utf8_str() instead of directly using wxConvUTF8
as this is simpler and also works correctly in non-Unicode build (and more
efficiently in UTF-8 build as no conversion is done there).

Do not allocate -- and leak -- buffer in wxHTMLDataObject::GetDataHere(),
we're supposed to be putting data into the caller-provided buffer instead of
using our own.

Closes #14391.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-10 11:57:20 +00:00
Paul Cornett
6b66bb1e55 silence warning about __WXMSW__ not defined 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-31 16:28:42 +00:00
Robin Dunn
b8acf11e74 A patch adding wxHTMLDataObject which can be used for handling the standard platform formats for transfering HTML formatted text. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-30 19:21:42 +00:00
Vadim Zeitlin
d361ea0db5 Pass the original format to wxDataObjectSimple in wxDataObjectComposite. 
Some "simple" data objects, such as wxTextDataObject, are actually not simple
and support multiple formats so pass the real format to them so that they
could do the right thing.

Closes #14101.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-03-15 13:49:49 +00:00
Vadim Zeitlin
5dea30b309 Don't add spurious NULs at the end of wxTextDataObject text under OS X. 
For some reason we added an extra NUL character to the data copied from
wxTextDataObject but this doesn't seem necessary because the Pasteboard API
is passed the correct data size and so the string doesn't need to be
NUL-terminated.

In fact, adding this NUL broke drag and drop between wx and native controls,
including the case of dropping text in our own wxTextCtrl as this uses its
built in support for dnd and not our code (the fact that we can't even set a
drop target for a wxTextCtrl is a separate bug). In this case we got a string
with an extra NUL in the control resulting in all sorts of hard to debug
problems.

So simply don't add the extra bytes, dnd works fine without them both between
wx windows and from/to another OS X applications.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-10 19:28:52 +00:00
Vadim Zeitlin
c82f9bcf7f Revert the wxDataObjectComposite checks added by r58549. 
The checks for data format duplication in wxDataObjectComposite::Add() added
by this revision were broken and didn't actually check anything. It also
doesn't seem clear why do we need them at all so simply remove them. See #10437
for more details.

This also closes #12113 as a side effect because the messages are not present
any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-13 11:33:03 +00:00
Francesco Montorsi
9113ffaf56 fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason of recents modifications to wxDataObjectComposite (closes #10430) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-06 23:42:06 +00:00
Francesco Montorsi
f453d7eada fix wxTextDataObject::GetDataHere and SetData functions (under wxMSW) so that they work with strings with embedded NULLs and can cope with non-NULL terminated arrays. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-06 22:45:00 +00:00
Robert Roebling
dc8928439f Fixes #10437 (wxDataObjectComposite::Add may add objects having data formats that already exist in the composite object) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-31 13:41:11 +00:00
Robert Roebling
0dd48109b4 Fixes #10432 (wxDataObjectComposite::GetAllFormats() does not work) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-31 13:36:32 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 02:39:52 +00:00
Vadim Zeitlin
98ecad0621 avoid unnecessary conversions in wxTextDataObject code in UTF-8 build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-21 15:53:21 +00:00
Włodzimierz Skiba
e7c80f9e05 wx/debug.h is always unconditionally included by wx/defs.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-24 15:13:23 +00:00
Robin Dunn
c072c75701 Give wxDataObjectComposite a way to report what kind of data was given 
to it from the clipboard or DnD source.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-15 05:35:08 +00:00
Robert Roebling
f7570f5771 Use memcpy instead of strcpy. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-30 09:53:15 +00:00
Robin Dunn
2c906a4907 The null byte at the end of the string should not be included in the 
size of a text data object in the clipboard, otherwise we have to
subtract it when the data is requested and that results in truncating
one byte for other data formats.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-25 00:06:25 +00:00
David Surovell
7ca019817d fixed compilation issue in prior checkin 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-23 00:41:09 +00:00
David Surovell
8b4457965a cleanup - reformatting 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-22 23:03:04 +00:00
Vadim Zeitlin
d1dbe757c0 blind compilation fix for CW 8.3 in Unicode build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-09 12:32:56 +00:00
Vadim Zeitlin
259c43f679 more extra semicolons removed (patch 1303724) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-25 11:16:57 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-23 12:56:45 +00:00
Stefan Csomor
671478ee46 adapting text object data handling along the GTK2 lines 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 08:46:08 +00:00
Kevin Hock
e0a3672027 Added null checks to wxTextObjectData::GetDataHere and GetDataSize [ patch 1237326 ] 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-17 03:15:50 +00:00
Stefan Csomor
d9d488cf1b UniChar being platform endian 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-06-08 23:34:05 +00:00
Vadim Zeitlin
f43707413a (blind) fix for GTK2/Unicode crashes when copying text to the clipboard 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-22 17:37:58 +00:00
Włodzimierz Skiba
68379eaf0a Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoord, !!/!IsEmpty(). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-10 12:56:07 +00:00
Stefan Csomor
b3370ae5d8 correcting unicode data conversion 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-28 08:45:42 +00:00
Julian Smart
655719367a Use old licence name 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-23 14:56:36 +00:00
Stefan Csomor
2575829710 unicode conversion support for dataobjects 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-15 14:58:09 +00:00
Robert Roebling
c7d6d88330 Comitted GTK part of clipboard patch, that 
enables non-unicode strings to be seen in
    Unicode apps. This is relevant since KDE
    apps paste non-Unicode text.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-15 22:46:48 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:46:53 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-10 19:55:12 +00:00
Chris Elliott
7d5848668d fix DMars compilation to use precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-06-18 12:09:16 +00:00
Chris Elliott
f15dcc0158 update to make digitalmars compile/link libraries 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-04-28 21:12:02 +00:00
Julian Smart
55d99c7a77 Fixed copyrights and licence spelling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-17 11:28:33 +00:00
Robert Roebling
6a59178a52 wxTextDataObject should convert to and 
from UTF8 in Unicode mode under GTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-15 20:47:04 +00:00
Vadim Zeitlin
f7f50f493b return NULL from the functions returning a pointer, not FALSE (patch 544557) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-04-16 08:57:36 +00:00
Vadim Zeitlin
e6b01b78a3 fixed mem leak in wxDataObjectComposite 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-12-03 00:30:51 +00:00
Mattia Barbon
e1b435afad 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
 2001-09-21 00:58:32 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-06-26 20:59:19 +00:00
Vadim Zeitlin
5bcea60e1b warning in wxCustomDataObject::Free fix (I hope) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-03-08 15:08:17 +00:00
Vadim Zeitlin
d9317fd472 1. added wxEnhMetaFileXXX classes 
2. fixed/added copy/paste for metafiles


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-13 23:39:48 +00:00
Guillermo Rodriguez Garcia
31e78e0cb6 Fixed from Mumit Khan to allow DLL compilation for mingw32 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-10 01:00:13 +00:00
Vadim Zeitlin
f3ac12aa7a compile fix for VC++ 5 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-06 19:46:06 +00:00
Vadim Zeitlin
4e16881a08 readded clipboard support to richedit sample and fixed a fatal bug in 
wxCustomDataObject (uninitialized m_data) which this allowed to discover


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-03 01:13:04 +00:00