Commit Graph

107 Commits

Author SHA1 Message Date
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
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
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
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
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
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 08:50:17 +00:00
Vadim Zeitlin
e4ef49c7a7 don't need to check if we set the same cursor before setting it: SetCursor() already checks for this anyhow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 21:53:52 +00:00
Robin Dunn
833cce0628 More compile fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 21:08:59 +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
621ae37407 Call Update after user input to improve responsiveness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 10:11:32 +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
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
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
Paul Cornett
07854e5edd warning fixes/minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 07:37:25 +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
1c07e924cd Use wxIsalnum to test for word delimiters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-02 12:47:31 +00:00
Julian Smart
e6474d62a8 Compilo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-02 12:38:47 +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
64c47f48c3 Converts DOS line endings to Unix if necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-26 19:18:46 +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
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
Włodzimierz Skiba
5e4a89ba45 PCH build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 11:02:41 +00:00
Włodzimierz Skiba
613992479a Simplify PCH support. Minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 08:39:57 +00:00
Julian Smart
3956d02ab6 Scrolling improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-04 15:35:34 +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
563d25babe Need to convert from physical to logical units inside HitTest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-01 16:43:54 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 07:16:32 +00:00
Vadim Zeitlin
99257cbe01 don't let the user modify the contents of read-only control (modified patch 1463707)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 16:22:42 +00:00
Włodzimierz Skiba
faa94f3ec8 Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprecate old ids, remove rest of build problems with case statemets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 12:25:17 +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
Michael Wetherell
8d7eaf9140 Warning fixes for VC5 (Igor Korot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:16:56 +00:00
Julian Smart
f9ed2d1680 Scroll text into view when typing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 13:05:30 +00:00
Włodzimierz Skiba
41e155b43e eVC4 warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 20:44:43 +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
76bcd8154c Don't clear background in Refresh (to suit poor implementations of Refresh)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 10:41:38 +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
d21423356e Don't try to open clipboard if already open
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 20:43:02 +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
7383cf9d17 Fixed warning, move caret in OnPaint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 14:50:29 +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