Commit Graph

35 Commits

Author SHA1 Message Date
Julian Smart
6d53143092 Fixed problems caused by duplicated names across different style types.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-17 09:46:59 +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
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
Julian Smart
519884a03d GetStyleMergedWithBase no longer hangs if there's a loop implied by based-on styles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-07 07:39:31 +00:00
Julian Smart
02aa812cb0 wxRTC: fixed style selection reset after editing a style.
wxRTC: can now edit line spacing in .1 increments from 1 to 2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-27 16:09:22 +00:00
Julian Smart
6eff83b827 Fixed #11212 [RichText sample] Assert/Crash when Styles combo box opened
Patch by Catalin


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-18 14:01:21 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Julian Smart
e2d0875aa7 Improved auto list numbering
Fixed selection bugs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-22 15:21:50 +00:00
Julian Smart
3570a1c6e5 Performance optimization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-14 11:01:18 +00:00
Julian Smart
3f239e3760 Take basic style into account when showing style under cursor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-27 17:34:23 +00:00
Julian Smart
2fce654762 Border corrections, and more compact dialog sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-14 14:42:31 +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
Julian Smart
a047aff270 Added wxBORDER_THEME, wxWindow::GetDefaultBorderForControl(), wxWindow::CanApplyThemeBorder().
wxTextCtrl and wxSearchCtrl now get the correct border on wxMSW, and the wxRichTextCtrl sample
also now demonstrates correct borders.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-07 19:22:43 +00:00
Vadim Zeitlin
ecb7235d76 don't use m_stylePopup inside GetRichTextCtrl() before testing whether it's NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 16:05:25 +00:00
Vadim Zeitlin
cd5dea50f8 don't use potentially NULL m_styleListBox (coverity CID 190)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 15:35:44 +00:00
Włodzimierz Skiba
8a8e9df88a Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-10 10:47:44 +00:00
Julian Smart
3706bae03e Correction to style code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-30 14:52:36 +00:00
Julian Smart
486dd03abb Styles now sorted alphabetically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-26 12:47:53 +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
380a5dd803 Limit indentation in style listbox, and also show centring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-17 08:21:38 +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
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
86015e55eb Added option to set style from style listbox when single
clicking or not. Changed DoSelection name to ApplyStyle.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 14:02:28 +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
e637208a32 Style listbox now shows current style
Added combo control for selecting styles
Updated the sample to show the combo control


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-12 10:19:45 +00:00
Włodzimierz Skiba
02761f6cd4 Include wx/module.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-31 19:31:43 +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
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
09f1410821 Corrections for wxUSE_STL=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 11:40:32 +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