Commit Graph

250 Commits

Author SHA1 Message Date
Julian Smart
29ec9f9b02 Corrected layout when scaling the control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-04 10:47:55 +00:00
Julian Smart
914a4e23e4 Corrected loading of images: we need the parent size to compute initial object size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-28 17:23:09 +00:00
Julian Smart
f7667b84a6 Added support for sub-object virtual attributes (temporary attributes for characters within objects)
and also virtual text that can replace the actual text.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-04 12:52:14 +00:00
Julian Smart
f5613c9b12 Detect when the window is still captured when dragging was aborted for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-08 10:25:01 +00:00
Julian Smart
76e36b9452 Fix for bug #14915 - wxRichTextCtrl: Not able to move up to empty first line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-22 21:31:13 +00:00
Julian Smart
4aa079bf56 Don't write text if it's empty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-10 15:45:08 +00:00
Vadim Zeitlin
732281950a Remove the now unnecessary wxRichTextCtrl::SelectAll().
It is already inherited from the base wxTextEntry class.

See #14701.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-27 22:40:46 +00:00
Julian Smart
4ce3ebd3f5 Added continuation bullet style for supporting multiple paragraphs in a list item
The user can 'delete' the bullet to create a continuation paragraph


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-15 06:42:15 +00:00
Julian Smart
75e50f45c9 Fix for caret positioning bug when selecting content
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-13 18:11:24 +00:00
Julian Smart
04b2b47a4e Fixed wxRichTextCtrl caret test case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-13 16:38:15 +00:00
Julian Smart
5a0259e657 Fix for scroll position being changed when partial layout is done
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-08 10:28:27 +00:00
Julian Smart
5a376169b1 Fixed #14417: wxRichTextCtrl crashes on LoadFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-18 18:45:30 +00:00
Vadim Zeitlin
345c78ca5f Use wxDynamicCast() instead of IsKindOf() checks.
wxDynamicCast() is less verbose (due to the absence of "CLASSINFO") and more
compatible with the standard dynamic_cast<>, so prefer to use it when possible.

See #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:18 +00:00
Julian Smart
4ba36292f4 Added full scaling to wxRTC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-26 14:17:46 +00:00
Jouk Jansen
55e0100847 Fix compilation when wxUSE_DRAG_AND_DROP=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-22 07:37:10 +00:00
Julian Smart
32423dd824 Added pixel size capability to wxTextAttr and wxRichTextCtrl.
Fixed composite object positioning in centred and right-aligned
paragraphs.
Added field example to sample, and enabled pixel font size selection.
Added custom text and dimension scaling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 12:25:22 +00:00
Julian Smart
7c9fdebe5f Added field implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-09 11:06:04 +00:00
Julian Smart
f819ed5d42 Moved default margins to buffer class Init; reduced chance of accidental selection when clicking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-08 17:31:06 +00:00
Julian Smart
bea12bf084 Added non-breaking space to whitespace check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:12:27 +00:00
Julian Smart
e059e1bb33 Added flags to SetStyle with specific object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-23 16:54:52 +00:00
Julian Smart
6cabfc592b Always send wxEVT_COMMAND_RICHTEXT_DELETE event if delete or back key pressed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-29 15:06:49 +00:00
Julian Smart
12f5219fac Added functionality for disabling the vertical scrollbar.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 17:01:30 +00:00
Julian Smart
6460c5990b Minor fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-20 17:58:39 +00:00
Julian Smart
cc2aecdef5 Added further API for intercepting deletion and content insertion
Added simple implementation of locked objects to sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-25 15:10:09 +00:00
Julian Smart
8db2e3ef15 Added drawing context to allow 'virtual' (dynamic) attributes, for e.g. showing bookmarks without affecting the content
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 20:03:13 +00:00
Julian Smart
590a0f8bcb Support for undoable application of custom properties, and customisation of properties menu label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-17 12:56:53 +00:00
Julian Smart
303f0be79e Added min and max size to box attributes; made property editing more customisable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-15 18:26:58 +00:00
Julian Smart
bb7bbd12d3 Improved layout, in particular passed a container size in order to allow relative size calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 14:19:50 +00:00
Jouk Jansen
9fa7b43626 Correction for the #define wxUSE_DRAG_AND_DROP 0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-09 07:18:19 +00:00
Julian Smart
1199fbd4e0 Fixed default style setting to take into account text boxes; fixed AddBoxStyle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-08 18:27:47 +00:00
Julian Smart
4e63bfb9b3 Removed compilation ambiguity between different forms of ...WithUndo functions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 15:48:21 +00:00
Julian Smart
b9433288e4 Fixed box style application.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 14:10:24 +00:00
Julian Smart
cd45ed3622 Possible fix for #13821: wxRichTextCtrl using 100% CPU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 14:41:29 +00:00
Julian Smart
b33e0c2c5b Disable drag and drop if the control is not editable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 15:24:20 +00:00
Julian Smart
0c0e063e66 Applied #13819: wxRTC drag and drop, by dghart, with tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 14:09:34 +00:00
Julian Smart
eadb039ed5 When the focus object changes, the old selection should be
cancelled explicitly to avoid seeing multiple selections until the next
refresh.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 17:22:11 +00:00
Julian Smart
9b794421ae Split up the context menu functionality to make it easier to customise.
Tweaked style combobox popup border.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 17:12:37 +00:00
Julian Smart
575be97600 Applied patch in #13777 (wxRichTextCtrl scroll and delete not refreshed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-25 17:04:51 +00:00
Julian Smart
5dec941a5b Applied #13763 from dghart, to use primary selections if available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 11:32:58 +00:00
Julian Smart
dabf7342ef Fixed warning when compiling richttextctrl.cpp in VS2010 (fixes #13606)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-30 13:39:11 +00:00
Julian Smart
75936ec600 Applied patch #13534: wxRichTextCtrl: Make it easier to use TextEffects flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-22 13:19:40 +00:00
Julian Smart
423b9ba554 Fixed caret sizing problem around large objects by clipping the caret to the margins
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-29 12:05:21 +00:00
Stefan Csomor
675ec6655e adapting to new ctrl constant handling on OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-16 13:46:56 +00:00
Julian Smart
e3bb4c547a Fixed Replace() to use the passed range instead of current selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-22 13:07:40 +00:00
Julian Smart
77ea6c48d3 Fixed shift-click selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-21 09:56:32 +00:00
Julian Smart
5219cf0588 Caret dropout fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-15 07:54:41 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Julian Smart
987695522c Added ForceDelayedLayout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-21 12:44:26 +00:00
Julian Smart
c1dd924de0 Correction to position in character insertion event when also deleting selected text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-09 10:28:45 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +00:00