Commit Graph

290 Commits

Author SHA1 Message Date
Vadim Zeitlin
4b6a582bef replace more __WXDEBUG__ occurrences with wxDEBUG_LEVEL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-22 12:53:48 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 13:55:27 +00:00
Francesco Montorsi
7d76fbd5a1 use enumerations instead of integers for wxFont style/weight/family
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-16 20:46:20 +00:00
Julian Smart
9c4cb61167 Added font family to wxTextAttr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-15 09:20:55 +00:00
Julian Smart
4ab8a5e2f1 Fixed [wxRichTextCtrl] Right Alignment sets text in the RTC too close to the border (#10277)
Also [wxRichTextCtrl] Wrong text positioning if different font sizes in the same paragraph (#10279)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-10 14:55:52 +00:00
Francesco Montorsi
a51e601e17 s/wxGetTempFileName/wxFileName::CreateTempFileName
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-07 01:01:35 +00:00
Julian Smart
43a0d1e1e9 Compile fix
Centre/right justification fix when there is a right indent


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-28 16:04:55 +00:00
Julian Smart
34b4899df5 Fixed centering and right-justification when combined with left indentation (bug #10221).
Fixed wrapping problem for long lines (bug #10149).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-28 15:53:13 +00:00
Vadim Zeitlin
62891c875f comparison of wxBitmapType with -1 is useless as it can never be true; assume wxBITMAP_TYPE_INVALID was meant here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-14 23:09:04 +00:00
Francesco Montorsi
046fce4786 fixed a bug caused by passing a wxChar[] buffer to a function taking a wxString; the buffer was automatically converted but since it was not NULL-terminated, a crash resulted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-09 17:00:32 +00:00
Julian Smart
5cb0b827f1 Switched off some buggy optimisation that caused caret positioning/drawn text mismatch.
Fixed defragmentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-16 10:58:32 +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
043c0d5843 Shift+Return now puts the cursor on the next line
Fixed GetContiguousPlainText bug that caused wrapping problem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-13 12:13:38 +00:00
Julian Smart
9c8e10ad37 Out by one correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-04 06:14:59 +00:00
Julian Smart
f1d800d91e Fixed a bug preventing style resetting to occur
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-18 17:03:53 +00:00
Julian Smart
d1e5be0ec6 Fixed common style collection and superscript/subscript selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-17 17:54:11 +00:00
Paul Cornett
2a23042680 fix some warnings from GCC -Wextra
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-15 17:24:48 +00:00
Francesco Montorsi
d75a69e832 replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and wxMemoryFSHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-10 09:40:33 +00:00
Julian Smart
71d8e824aa Apply previous paragraph style if pasting plain text, but not if pasting rich text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-09 08:47:08 +00:00
Julian Smart
1c13f06e4e Added a wxRichTextCtrl-specific caret implementation in case of need
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-29 09:10:32 +00:00
Julian Smart
affbfa1f29 Bug fix for empty objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-27 17:17:18 +00:00
Julian Smart
7051fa4161 Further wxRichTextCtrl performance improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-27 13:29:53 +00:00
Julian Smart
4f3d5bc061 Made performance acceptable for editing large paragraphs on low-powered machines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-24 14:39:33 +00:00
Julian Smart
109bfc88a4 Further optimizations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-24 11:43:39 +00:00
Julian Smart
2f45f5545f Further performance optimizations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-23 15:01:33 +00:00
Julian Smart
72945e2434 Two bug fixes for FindWrapPosition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-22 07:57:28 +00:00
Julian Smart
31778480a9 Speeded up wrapping (again), this time using partial text extents.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-21 15:26:27 +00:00
Julian Smart
bf104bf71b Fix for slow first character insertion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-20 19:08:19 +00:00
Julian Smart
30bf763039 Added wxRichTextCtrl superscript and subscript support (Knut Petter Lehre).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-10 14:05:44 +00:00
Paul Cornett
04ee05f92a fix a huge number of build errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-17 18:26:00 +00:00
Julian Smart
6c0ea5130f Don't take the previous paragraph style when deleting paragraph marker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-26 17:59:06 +00:00
Julian Smart
62381daaaf Fixed bug [ 1870906 ] There are few problems selection text by mouse in RichTextCt
Fixed bug [ 1870265 ] window does not scroll after pasting text
Fixed bug [ 1870264 ] wxTextUrlEvent after click in empty space
Fixed bug [ 1806479 ] wxRichText URL issues (URL event triggered when clicking on blank space)
Fixed bug [ 1806953 ] wxRichTextControl::AddParagraph() is broken
Fixed a bug in SelectWord causing bad selections.
Added Ctrl+Backspace word deletion.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-26 12:54:01 +00:00
Julian Smart
6ccbca24ee Fix caret position when deleting last character
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-21 16:58:43 +00:00
Julian Smart
5607c89090 Don't treat character attributes as non-paragraph attributes if using a named paragraph style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-21 16:23:39 +00:00
Julian Smart
4b3483e73b Fixed two out by one errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-20 20:33:18 +00:00
Julian Smart
fa01bfddc6 Avoid paragraphs with no children
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-16 13:36:03 +00:00
Julian Smart
0745f36410 Fixed undo batching
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-13 16:28:00 +00:00
Julian Smart
c025e094f4 Further fixes, for selected text display and new paragraph insertion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-13 14:24:49 +00:00
Julian Smart
99404ab05f Fixed several style, paste and undo bugs
Added a reload function to the sample for quickly restoring original text


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-12 17:05:54 +00:00
Vadim Zeitlin
b8e58b85d9 remove extraneous IncRef() from wxRichTextFontTable ctor (replaces patch 1884594)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-09 15:41:28 +00:00
Julian Smart
cd8ba0d9e4 Added a reset-buffer event to give an opportunity to set the default initial style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-01 14:14:44 +00:00
Julian Smart
44580804c2 Take basic style into account when applying style sheet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-27 17:37:17 +00:00
Julian Smart
3c8766f7dc Optimization correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-24 17:28:59 +00:00
Julian Smart
c21f3211ea Fixed pasting inefficiency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-30 14:20:49 +00:00
Paul Cornett
d65381ac34 fix for link errors in DLL build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-11 05:56:42 +00:00
Julian Smart
ecb5fbf135 Big wxRichTextCtrl performance increase due to faster wrapping code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-06 12:26:22 +00:00
Julian Smart
9b4af7b7de Fixed bug in optimization for character input, affecting first paragraph in the buffer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-25 16:13:47 +00:00
Julian Smart
0ec6da0248 Now uses the correct selection colours.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-25 14:53:07 +00:00
Julian Smart
caad01090a Fixed a style application bug inserting a newline other than after the end of a paragraph.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-25 14:41:21 +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