Commit Graph

29 Commits

Author SHA1 Message Date
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
ebd90cced0 Increased size slightly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-12 12:02:54 +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
4753c7ce48 PDA adjustements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-21 15:28:50 +00:00
Włodzimierz Skiba
1226b3b335 Reuse common sample resources. Remove unused files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-20 14:55:38 +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
da0d2c78ce Seems to work fine without switching off anti-aliasing now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-02 06:58:02 +00:00
Julian Smart
13127359b0 Changed order of libs to fix linking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 08:19:12 +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
Julian Smart
7f0d9d717d Added support for tabs in wxRichTextCtrl (Ashish More)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-28 10:57:20 +00:00
Julian Smart
0a292d0de4 Added missing makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-22 14:20:44 +00:00
Robin Dunn
15fa9a1f82 fixed line endings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 06:38:38 +00:00
Vadim Zeitlin
ff3e84ffdc File/dir dialog styles and other changes (patch 1488371):
- check invalid combinations of styles in wxFileDialogBase::Create()
- use wxFD_XXX naming convention for wxFileDialog styles
- replaces wxDD_NEW_DIR_BUTTON with wxDD_DIR_MUST_EXIST
- removes #ifdef __WXGTK24__ / #endif blocks from wxGTK code
- removes wxFileDialogBase::Get/SetStyle and wxFileDialogBase::m_fileName
- renames wxDirDialogGTK to wxDirDialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 23:32:12 +00:00
Włodzimierz Skiba
61609f69a5 Removal of first part of dsw files (as requested by Jamie Gadd).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-21 20:08:59 +00:00
Michael Wetherell
9d309aad76 Rebake all the VC++ project files and makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 23:06:27 +00:00
Julian Smart
b71e9aa4e2 Separated XML and HTML rich text I/O handlers
Cleaned up XML I/O
Added HTML handler to build system
Added encoding member for saving files output


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:31:07 +00:00
David Elliott
8ced02f601 Ran make -f build/autogen.mk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 05:17:36 +00:00
Michael Wetherell
5c60e84569 Regenerate Makefile.in, configure and the VC++ project files after adding rcdefs.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 02:34:32 +00:00
Włodzimierz Skiba
dbf38e885e Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 16:53:29 +00:00
Włodzimierz Skiba
9a173d48f7 wxWinCE build fix and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 23:18:15 +00:00
Michael Wetherell
ebef1625fa Rebake after adding libs html and xml to samples using lib adv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 21:56:27 +00:00
Julian Smart
c4cd20cfa7 Removed duplicate hotkey
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 08:46:41 +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
ff2baa25d5 Switched antialiasing off since GetTextExtent doesn't work properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 16:31:07 +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
1e967276d8 Efficiency measures; file loading bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 12:55:53 +00:00
Włodzimierz Skiba
7f9d2f2aaf richtext.bkl added and dmars makefiles removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 16:56:27 +00:00
Julian Smart
011b3dcbef Only draw if inside client rectangle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 13:54: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