AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,889 Commits 1 Branch 0 Tags 297 MiB
b2e04188bd
Commit Graph

79 Commits

Author SHA1 Message Date
Julian Smart
5ad9ae3a29 Fixed #12566 (assert on deletion) due to inconsistent commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-14 18:06:02 +00:00
Julian Smart
8995db52f3 Don't use wxDC in header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-06 21:27:07 +00:00
Julian Smart
bec80f4f4a Eliminated redundant wxRichTextAnchoredObject class; refactored XML I/O code 
so that objects can stream themselves; added a wxXmlDocument-based method
of writing XML, though this turned out to be much slower than writing directly
so the direct approach is retained and is the default (can be changed with wxRICHTEXT_USE_XMLDOCUMENT_OUTPUT).
Loading and saving new attributes implemented. Added custom properties to objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-06 20:22:03 +00:00
Julian Smart
6ffb5e91ea Exports fixed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-04 12:25:27 +00:00
Julian Smart
2477747881 wxRTC no longer derives from wxTextCtrlBase; added wxRichTextAttr deriving from wxTextAttr 
with CSS-like attributes for future developments; removed image-specific attributes object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-04 08:37:31 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace. 
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 11:44:45 +00:00
Vadim Zeitlin
cdaed652d7 Merge of SOC2010_RTC_IMAGES branch. 
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 10:27:07 +00:00
Julian Smart
749414f70f wxRTC's own caret is more reliable than the generic one, so use it. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-14 15:52:48 +00:00
Julian Smart
a188ac2988 wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-17 21:10:04 +00:00
Julian Smart
e0983733bd Fixed wxRichTextRange != operator 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-12 10:17:44 +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
Julian Smart
43a0d1e1e9 Compile fix 
Centre/right justification fix when there is a right indent


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 16:04:55 +00:00
Vadim Zeitlin
42632bcee1 fix MSVC /Wp64 warning about size_t to int conversion (closes #10068) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-31 17:14:12 +00:00
Francesco Montorsi
f632e27b3f group hit-test flags into an enum (like I did in docs); this makes easier to document them, but is also logically the best thing since wxRichTextBuffer::HitTest is documented to return only _one_ of those flags. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-10 19:13:50 +00:00
Julian Smart
5cb0b827f1 Switched off some buggy optimisation that caused caret positioning/drawn text mismatch. 
Fixed defragmentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-16 10:58:32 +00:00
Julian Smart
a2beab222f COnversion of some common font names to current platform 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-20 13:24:53 +00:00
Julian Smart
d1e5be0ec6 Fixed common style collection and superscript/subscript selection 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-17 17:54:11 +00:00
Francesco Montorsi
d75a69e832 replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and wxMemoryFSHandler 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-10 09:40:33 +00:00
Julian Smart
1c13f06e4e Added a wxRichTextCtrl-specific caret implementation in case of need 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-29 09:10:32 +00:00
Julian Smart
7051fa4161 Further wxRichTextCtrl performance improvements 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-27 13:29:53 +00:00
Julian Smart
4f3d5bc061 Made performance acceptable for editing large paragraphs on low-powered machines 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-24 14:39:33 +00:00
Julian Smart
109bfc88a4 Further optimizations 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-24 11:43:39 +00:00
Julian Smart
2f45f5545f Further performance optimizations 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-23 15:01:33 +00:00
Julian Smart
31778480a9 Speeded up wrapping (again), this time using partial text extents. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-21 15:26:27 +00:00
Julian Smart
30bf763039 Added wxRichTextCtrl superscript and subscript support (Knut Petter Lehre). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-10 14:05:44 +00:00
Julian Smart
6c0ea5130f Don't take the previous paragraph style when deleting paragraph marker 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-26 17:59:06 +00:00
Julian Smart
c025e094f4 Further fixes, for selected text display and new paragraph insertion 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-13 14:24:49 +00:00
Julian Smart
fe8b03618a Make SaveFile and LoadFile virtual so they can be overridden 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-11 19:56:38 +00:00
Julian Smart
44cc96a80c Merged wxRichTextAttr and wxTextAttrEx into wxTextAttr, and added a font table 
to wxRichTextBuffer to reduce wxFont consumption and increase performance.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-09 11:20:36 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Vadim Zeitlin
a9b9495bc0 put #if wxUSE_FFILE && wxUSE_STREAMS around functions using wxFFileStream (patch 1721939) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-24 10:59:56 +00:00
Julian Smart
aeb6ebe2a5 Added flag for removing attributes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-07 12:24:17 +00:00
Julian Smart
f262b25c93 Added extra hit test style for more accurate reporting 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-01-28 16:57:07 +00:00
Robin Dunn
d8dd53b239 Fix compile error 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-01 23:52:54 +00:00
Julian Smart
07b2748093 Correction to accessors 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-30 13:50:12 +00:00
Vadim Zeitlin
336d8ae9a3 documentation for wxAppTraits (patch 1518295 from Francesco) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-24 18:20:18 +00:00
Julian Smart
ff76711fbe Fixed a bug setting caret position after setting or clearing selection 
Implemented forced line breaks within a paragraph, entered with Shift-Return.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 11:33:44 +00:00
Julian Smart
12cc29c56a Small cleanup. 
Set caret position when calling SetSelection.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-18 22:27:48 +00:00
Julian Smart
5912d19ef7 Removed obsolete code 
Added some more event types
Added back GetStyleForRange


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-17 14:28:47 +00:00
Julian Smart
b774c69893 Added wxRICHTEXT_HANDLER_NO_HEADER_FOOTER to allow saving HTML fragments 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-17 08:40:01 +00:00
Julian Smart
523d2f145e Added wxRICHTEXT_SETSTYLE_RESET SetStyleEx() flag to allow for clearing attributes before setting new ones 
SetStyle() now looks up and applies named paragraph or character style
Fixed a bug in text entry (taking previous paragraph's style)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-17 08:33:34 +00:00
Julian Smart
4d6d8bf4fb Added outline level 
Removed unnecessary wxRichTextAttr::CopyTo


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-10 15:48:46 +00:00
Julian Smart
42688aea2d Added a couple of text effects 
Added style description
Fixed some bugs in style comparison
Fixed extra newline when loading


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-08 14:05:50 +00:00
Julian Smart
4f32b3cf15 Style application fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-02 13:19:07 +00:00
Julian Smart
ea160b2e92 Reuse wxCaret object 
Add page break specification
Optimize drawing after character input


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 17:51:38 +00:00
Julian Smart
8871035d85 Digital Mars doesn't like the identifiers being declared later 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-29 22:01:06 +00:00
Julian Smart
85d8909ba3 Corrected a clearing bug 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-28 09:29:07 +00:00
Julian Smart
44219ff04f First cut at printing support for wxRichTextCtrl 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-27 08:43:44 +00:00
Julian Smart
d8dd214c1b Fixed initialisation order warning 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-26 08:05:18 +00:00
Julian Smart
d2d0adc776 Added URL support to attribute objects and to wxRichTextCtrl, 
generating a wxTextUrlEvent as appropriate.
Added outline list support and updated previews.
Added alignment support for bullets.
Added single right parenthesis support.
Added XML stylesheet reading/writing.
Changed SetBulletSymbol to SetBulletText so it can support
bullet text more generally (e.g. for cached outline list numbering)
Added wxRichTextRenderer to isolate e.g. bullet drawing and make
it customisable.
Added event handler support to wxRichTextBuffer.
Updated documentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-26 06:32:47 +00:00