Commit Graph

290 Commits

Author SHA1 Message Date
Julian Smart
93a16a7d51 Fixed a refresh bug due to the optimized refresh rect being calculated incorrectly.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-11 10:20:11 +00:00
Vadim Zeitlin
bf5e92db1c Fix crash when undoing the deletion of a nested table column in wxRTC.
Fix the object parent when applying the actions.

Closes #15186.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-10 15:52:41 +00:00
Julian Smart
4c86168d9a Applied patch for #15189 - avoid crash when deleting focused cell (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-26 15:32:12 +00:00
Vadim Zeitlin
0a6ec346d5 Reset row and columns count in wxRichTextTable::ClearTable().
No real changes, just update the internal variables in ClearTable() to avoid
inconsistent internal state, even if this doesn't seem to result in any
problems for now.

Closes #15190.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-26 13:14:48 +00:00
Robin Dunn
58d1949f8c Call InitializeModules instead of just module->Init(). This is needed so the module will have the proper state and not cause an assert when the modules are cleaned up. Since InitializeModules will skip any that are already initialized it doesn't hurt to call it for modules loaded later.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-07 21:09:31 +00:00
Julian Smart
31be840031 Applied patches for #15184 (wxRichTextAction fix for when the command identifier is wxRICHTEXT_CHANGE_OBJECT) and #15185 (Make adding/deleting wxRichTextTable rows and columns undoable)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-06 13:39:01 +00:00
Julian Smart
ef3f06797d Applied patch #15183 (wxRichTextTable::DeleteColumns doesn't remove the deleted columns: dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-06 08:54:48 +00:00
Vadim Zeitlin
a9fd42cceb Add empty paragraph in wxRichTextTable::AddColumns() and AddRows().
Do the same thing in Add{Columns,Rows}() as in CreateTable() to ensure the
proper cell creation.

Closes #15153,

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-29 12:54:13 +00:00
Vadim Zeitlin
ce7fe42e84 Provide shorter synonyms for wxEVT_XXX constants.
Use the same short names as are used by the event table macros for the event
type constants themselves. This makes them much more comfortable to use, e.g.
Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED).

The old long names are still kept for backwards compatibility and shouldn't be
removed as it doesn't really cost anything to continue providing them, but all
new event types should only use the short versions.

Closes #10661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-25 10:11:03 +00:00
Julian Smart
5fe7fce492 Don't reset URL if applying character style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-05 15:54:49 +00:00
Vadim Zeitlin
49b18c6cd9 No changes, just remove an unused line of code.
Fix g++ warning about initialized but unused variable in wxRTC code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-21 22:36:38 +00:00
Julian Smart
bafc4eacc4 Corrected clipboard data id
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-17 08:14:03 +00:00
Julian Smart
1bdb813110 Fixed centering/right alignment of last line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-16 19:36:50 +00:00
Julian Smart
77120d82a4 Search for font instead of creating it each time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-11 18:03:54 +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
ab6b186064 Prevent assertions because of zero image size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-27 08:41:37 +00:00
Julian Smart
2798df594d Fix wrong value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-16 15:39:10 +00:00
Julian Smart
83ef387efe Better compatibility with old files when creating an image cache
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-16 09:35:33 +00:00
Julian Smart
e12b91a306 Added Set/GetFloatingLayoutMode to switch off time-consuming floating object layout if required
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-14 16:19:45 +00:00
Julian Smart
c4168888e3 wxRTC text box layout fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-05 16:23:12 +00:00
Julian Smart
d07f2e1918 Added support for wxTEXT_ATTR_EFFECT_SMALL_CAPITALS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-12 18:58:30 +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
a8a15de623 Prevent index access error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-21 19:12:04 +00:00
Julian Smart
340ef5c5ab Corrected collection of common attributes, for clashing font size units.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-04 09:13:13 +00:00
Vadim Zeitlin
80a4659776 Use wxCLASSINFO() instead of deprecated CLASSINFO().
No real changes, just use the version of the macro with a "wx" prefix.

Closes #14356.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-01 11:01:24 +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
Julian Smart
5a0e33afa9 Don't use deprecated font family style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 13:06:43 +00:00
Vadim Zeitlin
b42e4b3e5a Compilation fix for wxRichTextCtrl.
Don't use wxDEFAULT, there is no match for wxFont ctor taking wxSize and it,
use wxFONTFAMILY_DEFAULT instead.

Also remove the unnecessary .c_str() from the same wxFont ctor call, there is
really no reason at all to have it there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 13:04:26 +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
d157d142f6 Fixed layout and hit-testing problem particularly with centred lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-11 22:15:39 +00:00
Julian Smart
1aca9fcdfc Added wxRichTextXMLHandler::RegisterNodeName so custom content classes can be added without
breaking XML loading


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-10 11:59:59 +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
20d09da5f8 Corrected top-level object layout in paragraphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 15:47:23 +00:00
Julian Smart
a70eb13eb2 Fixed inconsistent calculation of line height in paragraph layout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-07 13:13:30 +00:00
Julian Smart
23698b123b Fixed floating image layout when typing in subsequent paragraph
Now makes use of max size for images and keeps the image size reasonable
Added original image size so can usually avoid reloading image when recomputing
cached bitmap size
Takes into account bottom of the last floating image so scrollbars are
set correctly
Original image size is shown in disabled size controls


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-25 11:42:31 +00:00
Julian Smart
aa8f57f491 Removed unused variable warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-23 07:07:15 +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
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
61e6149e58 Fixed #13833: wxRichTextCtrl: 'Copy' can grab an extra character
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-05 14:08:52 +00:00
Julian Smart
eb3d8a3319 Implement missing wxTextBoxAttr::IsDefault function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 16:32:08 +00:00
Julian Smart
37e7b7838c Background now drawn within the border instead of beyond the margin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 14:00:29 +00:00
Julian Smart
63af79dee1 Fixed border drawing bug when width is more than 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 12:50:47 +00:00
Julian Smart
2f987d8309 Added a box style definition name to the box attribute.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-02 21:18:05 +00:00