Commit Graph

290 Commits

Author SHA1 Message Date
Julian Smart
797e38dde1 Added missing URL attribute testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-07 14:11:41 +00:00
Vadim Zeitlin
0ec1179b86 added wxTextEntry common base class for both wxTextCtrl and wxComboBox; refactor wxGTK code to put common parts of these classes in the base class; fixed some inconsistencies in the text control behaviour between platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-26 00:30:22 +00:00
Julian Smart
b78b6e887e Added omitted variable copy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-17 09:26:08 +00:00
Julian Smart
f728025eae Added a new overload of wxDecToHex and used it in wxRichTextImageBlock::WriteHex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-11 17:16:59 +00:00
Julian Smart
351c06476d Faster hex encoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-09 17:52:47 +00:00
Julian Smart
1a75935d3f Don't insert a newline when we get text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-07 12:49:35 +00:00
Vadim Zeitlin
f4f963f4a5 put #if wxUSE_FFILE && wxUSE_STREAMS around functions using wxFFileStream (patch 1721939)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-25 00:53:12 +00:00
Julian Smart
cc91438c0f Allow negative line spacing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-18 12:31:55 +00:00
Václav Slavík
47b378bd88 removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 09:58:37 +00:00
Václav Slavík
c9f7896861 first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 10:26:10 +00:00
Julian Smart
31002e44b5 Fixed wrapping with tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-11 12:48:38 +00:00
Julian Smart
0f1fbeb810 Fixed problem with tab size calculation not reflecting current position in the line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-05 17:15:01 +00:00
Julian Smart
f0e9eda2a5 Drawing correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-05 16:08:15 +00:00
Julian Smart
3e54156282 Implemented text background colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-05 15:22:07 +00:00
Julian Smart
4794d69c84 Fixed a problem with tabs when text spills over the end of the tab stops
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-20 12:54:44 +00:00
Julian Smart
3087eaea04 Layout correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-19 18:32:07 +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
Julian Smart
e3eac0ff7f Bullet size should take into account the font of the immediately following content.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 15:57:45 +00:00
Julian Smart
7c081bd21c Fix for newline breakage
Inserting text now retains style at current position


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-01 13:52:31 +00:00
Julian Smart
46ee0e5bf8 Fixed insertion point bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-01 12:39:21 +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
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
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
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
27b5dab348 Fixed compile error with --enable-stl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-01 09:45:06 +00:00
Vadim Zeitlin
3c738608b4 correct compilation after last change (added ifdef in the wrong function...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 16:19:24 +00:00
Vadim Zeitlin
87bfb3969f don't define specifyLevel variable in release builds (fixes gcc and probably others warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 12:51:57 +00:00
Julian Smart
6a81734334 Copy constructor warning elimination
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 18:15:31 +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
1f71a77057 Digital Mars fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 21:55:18 +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
46e7a90e47 Pagination fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-27 14:32:55 +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
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
Robin Dunn
f1d6804f7c Add wxRichTextModuleInit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-16 18:12:17 +00:00
Julian Smart
cfa3b25626 Fixed tab selection bug
Slight improvement to kerning-related jumpy text when selecting
Default tab efficiency improvement and naming conventions cleanup


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-13 14:30:40 +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
59509217cd Added paragraph symbol font (Get/SetSymbolFont in attribute)
and use this font instead of paragraph font if specified.

wxRichTextBuffer::SetStyle extended to respond to flags for
specifying undo, optimization (only apply the style necessary
for display when content/base/paragraph attributes are combined),
and para/character styles only.

wxRichTextBuffer::GetStyleForRange gets the common attributes
for a range, e.g. for showing common attributes in a formatting
dialog.

Implemented Roman numeral bullet points.

Fixed wxRichTextImage copy bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 13:59:07 +00:00
Vadim Zeitlin
fee9bb24d9 fixed VC warning about unreachable code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 00:35:44 +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