Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,362 Commits 1 Branch 330 Tags
aad3bfdd522d06a2be28145dc4ccbb349ce52b2f
Commit Graph

250 Commits

Author SHA1 Message Date
Julian Smart
1437c7fba6 Fix for #11647: text from WriteText not scrolled to be visible in wxRichTextCtrl 
IsPositionVisible was incorrect.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-25 17:28:27 +00:00
Julian Smart
3a4a38c143 Applied patch in #12279: in wxRichTextCtrl, when wxRE_READONLY is set, the undo, redo function should be disabled 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-25 12:25:12 +00:00
Julian Smart
343ef639a9 Fixed some bugs in up/down cursor navigation. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-20 15:02:19 +00:00
Julian Smart
4fe83b93a5 Fix for incorrect programmatic formatting (default style set immediately if not using Thaw/Freeze) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-18 13:34:10 +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
Julian Smart
1d12c6e2be Avoid id clashes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-04 08:10:27 +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
Vadim Zeitlin
cdaed652d7 Merge of SOC2010_RTC_IMAGES branch. 
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 10:27:07 +00:00
Julian Smart
edae63b076 wxRichTextCtrl::ApplyStyle now applies a paragraph style at the cursor 
without needing a selection, and setting the default style now avoids duplicating
character attributes in subsequently typed text when they exist in the paragraph style.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-01 14:48:54 +00:00
Julian Smart
35bdbae572 Added PaintAboveContent function for drawing on top of text (#12176) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-25 14:05:07 +00:00
Julian Smart
a216dfa2c1 Caret position corrected to end of selection 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-05-30 14:00:35 +00:00
Julian Smart
b30661fdd0 Don't select all if there is nothing to select. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-02-03 11:43:08 +00:00
Julian Smart
fc6d9d0d45 Don't delete previous character when pressing Del at end of buffer. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-02-03 09:51:53 +00:00
Julian Smart
205a1ad98f Fixes for incorrect selection, extra newline insertion when undoing deletion of selection, 
incorrect SetScrollbar optimization, insufficient refresh for operations on last line,
HasCharacter/ParagraphAttributes bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-02-02 22:19:33 +00:00
Julian Smart
76d7fc2904 Simplify SetSelectionRange and make consistent with SetSelection. 
Fix a bug that returns true for character and paragraph style tests if no characters or paragraphs were found.
Fix SetSelection to position caret at end.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-02-01 10:45:51 +00:00
Julian Smart
8e43fc7776 Context menu now created in constructor; old context menu deleted when new one set. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-29 06:45:36 +00:00
Julian Smart
4427f297a6 Fix for #4696: added SetDefaultStyleToCursorStyle() to SetInsertionPoint() so style is taken from context, not the style at a previous location. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-22 16:36:58 +00:00
Vadim Zeitlin
7a34307e24 Added wxKeyEvent::IsKeyInCategory() method. 
This allows to test whether a given key belongs to the category of e.g. arrow
keys or navigation keys in a more concise and more readable manner.

Closes #10268.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-23 00:32:17 +00:00
Julian Smart
ab52bac815 Fix numpad Del not working in wxRTC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-18 17:33:28 +00:00
Julian Smart
a188ac2988 wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-17 21:10:04 +00:00
Julian Smart
d2bb72ffd5 Fixed wxRTC AltGr+key input on Windows 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-04-02 09:51:13 +00:00
Julian Smart
d35146fa5d Removed conflicting virtual function 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-06 08:19:31 +00:00
Julian Smart
6d595f3d7a Don't crash if no scrollbar 
Force wxVSCROLL in wxRTC


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-03 13:12:52 +00:00
Vadim Zeitlin
805c8d92b9 wxOSX build fix for wxRichTextCtrl after wxTextEntry::GetValue() renaming to DoGetValue() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-02 20:43:12 +00:00
Julian Smart
f51723055a Fixed wxRichTextCtrl base class 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-27 10:54:12 +00:00
Julian Smart
492d6611d4 Corrected IMPLEMENT_CLASS/BEGIN_EVENT_TABLE base class 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-27 09:00:48 +00:00
Vadim Zeitlin
9b11752c4f require semicolon after wxDECLARE/DEFINE_EVENT() (closes #10456) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-07 18:59:25 +00:00
Julian Smart
e9f1000463 wxRTC now properly honours margin size 
Added wxRE_CENTRE_CARET style to centre the caret line vertically


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-21 12:06:21 +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
Vadim Zeitlin
3c77890141 add more flexible and safer template Connect() overloads (#10000) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-12 14:26:13 +00:00
Francesco Montorsi
d0960f6d3b fix wxPowerEvent, wxRichTextEvent and wxWizardEvent so that they pass the runtime check for correct implementation of the Clone() function 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-28 01:29:37 +00:00
Julian Smart
0951fe0add Added Undo, Redo accelerators for wxRTC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-03 12:31:07 +00:00
Julian Smart
29dbfacee2 Fixed inability to select no superscript and no subscript in wxRichTextCtrl's 
formatting dialog (fixes bug #10121)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 12:46:34 +00:00
Julian Smart
dc5de0dd36 wxRichTextCtrl no longer deletes a character when content is selected 
before pressing Delete (fixes bug #10153).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 12:35:15 +00:00
Julian Smart
8c9e72f982 Fixed problem with Croation input due to confusion of WXK_... values and character values. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-15 14:39:04 +00:00
Julian Smart
cfceb4a8e0 Only ignore Alt down on Mac 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-01 14:55:54 +00:00
Julian Smart
91babb9d5c Now accepts keys that are generated with Alt 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-01 14:44:55 +00:00
Julian Smart
8251c171de Fix for deleting first word in the control 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-28 18:02:23 +00:00
Julian Smart
6a8e61e0f6 Fixed Freeze problem that rendered control invisible 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-15 14:43:29 +00:00
Julian Smart
c80e8cbeab Fixed Cmd+Back, Cmd+Del word deletion behaviour in wxRichTextCtrl. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-07 15:35:30 +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
5ef8ac72f7 Take on appropriate paragraph style in the newly created paragraph. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-29 13:22:33 +00:00
Julian Smart
4bf9e5bc14 Tab removal 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-18 12:56:22 +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
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
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
0a21bea0dd Reverted patch 1906896 because it broke prgrammatic style application with BeginStyle/EndStyle. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-05 10:10:17 +00:00
Julian Smart
addcf76c65 Fixed [ 1905777 ] Defining default accelerators for wxRichTextCtrl 
Added standard accelerators for cut, copy, paste and select all.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-03 20:18:49 +00:00
Julian Smart
5cab4a770c Applied patch [ 1906896 ] Fix for bug #1906223 and optimization 
Don't set default style to cursor style until entering text
Andrej Sinicyn



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-03 20:07:28 +00:00