Commit Graph

40 Commits

Author SHA1 Message Date
Julian Smart
61f84e2493 Process capture lost event to avoid assertion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-29 19:37:04 +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
7d5232b815 Removed new function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-16 07:33:19 +00:00
Julian Smart
c7134e1c9c Made new functions non-virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-15 23:03:18 +00:00
Julian Smart
a7ed48a590 Small bug fixes
Added GetStyleForRange to wxRichTextCtrl
HasCharacter/ParagraphAttributes range now consistent with other functions in wxRichTextCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-15 15:59:06 +00:00
Julian Smart
4e8d95587c Add ctor parameters to match wxTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-08 18:51:03 +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
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
Julian Smart
f089713f9e Added the ability to use built-in bullet styles, currently standard/circle or standard/square.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-20 13:04:12 +00:00
Włodzimierz Skiba
41a852156f Whitespaces and headers cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-20 07:48:31 +00:00
Julian Smart
dadd4f5523 Added a list style editor page to the formatting dialog.
Added a style organiser dialog, which can be used to browse
for and apply styles and can be limited to show one of
the three style types, or all three.
Added a font name cache since it's an expensive operation
that's used frequently by the rich text dialogs.
Added ability to switch off tooltips for new dialogs
(off by default). Improved the previews. Pressing tab or shift-tab
at the start of a list item now demotes or promotes the item.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-19 14:04:13 +00:00
Julian Smart
38f833b10c Added list style to text attributes, independent from paragraph style
Added list style definition
Added SetListStyle, ClearListStyle, NumberList, PromoteList to
buffer and control classes
Changed style listbox so double-click applies style instead of
single click. This allows for multiple items to be applicable,
and also in future to edit styles from this listbox without
accidentally applying the style to content.
Added wxRichTextStyleListCtrl which also shows a wxChoice for
selecting the type of style to display.
Style sheets can form a chain to allow inheritance from current
style sheet (not yet supported by style list controls).
Added PushStyleSheet/PopStyleSheet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-17 14:09:14 +00:00
Julian Smart
1807a1f3cf Return type change
Added support for help button to formatting dialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-10 17:01:36 +00:00
Vadim Zeitlin
343ae70d4c fix compilation after recent wxTextCtrl changes
notice that it has become unfortunately impossible (or at least much more
difficult) to maintain compilation when wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
is unset so I simply removed it as the code wouldn't compile anyhow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 22:42:20 +00:00
Julian Smart
3e3a754f9c Don't use double buffering on platforms that do it automatically.
Filters out unrecognised keycodes in OnChar, and added numeric
keypad navigation keycodes.

Added SetStyleEx which takes flags for specifying option such
as optimization (only apply necessary styles), char/para style
only, and use undo. Used SetStyleEx when applying styles to
avoid applying character styles to paragraph objects, and vice versa.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 14:00:04 +00:00
Julian Smart
0ca07313fb Added rich text buffer clipboard support.
Added double-left-click word selection support.
Now saves only the active attributes to XML.
Eliminated wxRichTextFragment class to allow  wxRichTextBuffer
to be used where wxRichTextFragment was used.
Fixed AddParagraph virtual function hiding warning.
Miscellaneous small wxRichTextCtrl bug fixes and cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-01 14:46:03 +00:00
Julian Smart
fe5aa22c17 Fixed bugs in, and added operators and copy constructors to, style
sheet classes.
Now merges base, paragraph and content styles dynamically on
display or layout so that we can distinguish between them. This
means appling a paragraph style that has character formatting
doesn't wipe out the original content formatting. The old-style
static method can be enabled by setting wxRICHTEXT_USE_DYNAMIC_STYLES
to 0 in richtextbuffer.h.
The default style is initially empty, so that adding text
reflects the base and paragraph styles. Setting the default style
doesn't merge with the previous setting, but BeginStyle does.
Adding new paragraphs is now sensitive to the previous paragraph's
style and also whether its style has a next-paragraph style indication.
Added wxRichTextCtrl::ApplyStyleSheet which reapplies styles to
paragraphs with named styles.
Added style application command to sample to demonstrate how
styles can be changed and reapplied without affecting content
character formatting.
Fixed some range bugs in UI feedback and clipboard copying and pasting.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-29 08:53:23 +00:00
Julian Smart
3306aec124 Added DoLoadFile, DoSaveFile to wxTextCtrlBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-24 11:40:33 +00:00
Julian Smart
3966a9f4f8 Better compatibility between wxRichTextCtrl and wxTextCtrlBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-19 17:06:54 +00:00
Julian Smart
96c9f0f677 Corrections to take into account that range in the API has an end position
that is 1 more than the last affected position


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-19 13:47:32 +00:00
Julian Smart
4c0f681c9a Added public keyword
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-13 16:27:56 +00:00
Julian Smart
ab14c7aa57 Setting the current style from the UI is a mode that is cancelled when moving away
from the current caret position. This must be done to avoid confusing default
attributes and attributes at the current caret position, in normal use.
Style feedback now correct when caret is at the start of a paragraph (don't use
previous paragraph's style), and out-by-one style feedback bug fixed (start/end
of styled content).
Added ApplyStyle for applying a character or paragraph style.
Some coding style cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-12 08:42:40 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-05 20:47:48 +00:00
Julian Smart
27e20452c4 SetStyle/GetStyle corrections
Added compatibility ctor to wxTextAttrEx
wxRichTextCtrl should take a string value for wxTextCtrl compatibility


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 21:13:18 +00:00
Julian Smart
6b69c8ee88 Use wxTextCtrlBase as base class on 2.7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 17:51:34 +00:00
Julian Smart
c9f3a6a81d Typo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-02 07:17:46 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 07:16:39 +00:00
Vadim Zeitlin
a3a4105df6 it is not possible to show/hide the window from the UpdateUI event handler; refactored the code by moving control-specific parts into the derived classes (patch 1338350)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 16:32:50 +00:00
Vadim Zeitlin
6f02a879ed make access specifiers for the virtual functions match their access in the base class (patch 1400131)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 21:47:09 +00:00
Vadim Zeitlin
33c0ca829f declare rich text control event types with correct dll export qualifiers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 22:48:25 +00:00
Julian Smart
b01ca8b6a9 Applied patch [ 1339882 ] richtext misc cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 14:24:04 +00:00
Julian Smart
0bab774ba3 Fixed warnings/errors and changed Thaw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 17:51:10 +00:00
Julian Smart
2f36e8dce5 Now works when derived from wxTextCtrlBase, using wxScrollHelper.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 13:44:30 +00:00
Julian Smart
c59f6793fb Reduced unnecessary painting; delete/recreate caret as WIN32 requires
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 20:04:53 +00:00
Julian Smart
4d551ad5e5 Fixed some styling bugs, optimized resize for large files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:02:15 +00:00
Julian Smart
169adfa9c4 Resets scroll position on load
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 22:51:57 +00:00
Włodzimierz Skiba
7fe8059f58 const consistent for Clone(). Load/Save split to DoLoad/DoSave. Build fixes, warning fixes and other source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 17:00:58 +00:00
Julian Smart
5d7836c47d Added wxRichTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 12:52:47 +00:00