Commit Graph

95 Commits

Author SHA1 Message Date
Julian Smart
590a0f8bcb Support for undoable application of custom properties, and customisation of properties menu label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 12:56:53 +00:00
Julian Smart
303f0be79e Added min and max size to box attributes; made property editing more customisable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 18:26:58 +00:00
Julian Smart
bb7bbd12d3 Improved layout, in particular passed a container size in order to allow relative size calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 14:19:50 +00:00
Julian Smart
4e63bfb9b3 Removed compilation ambiguity between different forms of ...WithUndo functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 15:48:21 +00:00
Julian Smart
eb3d8a3319 Implement missing wxTextBoxAttr::IsDefault function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 16:32:08 +00:00
Julian Smart
2f987d8309 Added a box style definition name to the box attribute.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-02 21:18:05 +00:00
Julian Smart
71185527a0 wxRTC doc updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 16:45:34 +00:00
Julian Smart
7afd2b58c5 More work on improving wxRTC documentation, copied buffer and control headers to interface folder.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-08 18:29:51 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Julian Smart
b3169c12bc Further commenting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-04 17:55:56 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:31:32 +00:00
Julian Smart
706465df1f Applied #12941: Fixes and enhancements for wxRTC (Robert Hoffman)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-25 11:37:20 +00:00
Julian Smart
343ef639a9 Fixed some bugs in up/down cursor navigation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-20 15:02:19 +00:00
Julian Smart
23bdfeee49 Small doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 19:32:54 +00:00
Julian Smart
603f702b4a Implemented text boxes and tables, and further editing pages for backgrounds, borders and margins.
wxRTC functions now operate on the currently focused object, which by default is the whole buffer.
Up to three property commands are now shown on the context menu, depending on
available objects in the current hierarchy.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 11:57:44 +00:00
Paul Cornett
ec96ef0b6f fix GCC warning about not explicitly initializing base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:55:53 +00:00
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