Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,032 Commits 1 Branch 330 Tags
194e8b50112f8ad9d9f746ebc40872b9f83af5c4
Commit Graph

304 Commits

Author SHA1 Message Date
Julian Smart
194e8b5011 Paragraph layout fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-27 15:14:44 +00:00
Julian Smart
ee6b548043 Correction for wxTextAttrCollectCommonAttributes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-27 10:07:16 +00:00
Julian Smart
88bc9481c9 Fixed floating object layout when there is only a short text string in the paragraph 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-17 14:54:28 +00:00
Julian Smart
cbda10a5c0 Corrected wxTextBoxAttr::IsDefault() implementation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-13 12:01:08 +00:00
Julian Smart
5366d4bd97 Fixed a bug that prevented floating objects from being updated correctly 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-13 11:47:13 +00:00
Julian Smart
c3d2dbb92e Return true from GetRangeSize or partial extents will be incorrectly filled in 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-02-08 11:55:22 +00:00
Julian Smart
a0761842f1 Ensure a small spanned column doesn't shrink its columns too much by checking for min column sizes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-14 15:33:15 +00:00
Julian Smart
991b7d1b78 Fix for occasionally missing cells in tables 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-11 12:06:19 +00:00
Julian Smart
e60fe373fb Fixed overlapping text and floating objects by simplifying the available rectangle calculation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-08 10:30:39 +00:00
Julian Smart
3d60682cf5 Clicking on a floating (non-container) object no longer sets the caret position. 
Double-clicking on a floating (non-container) object selects it instead of selecting a word.
Selection refresh now takes floating objects into account.
The last line of a paragraph now takes floating objects into account.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-07 15:51:01 +00:00
Julian Smart
78779cdf84 Backported r75354: Fix layout of content within a floating object by using Move and not SetPosition; prevent creeping of floating objects on layout. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-07 15:12:00 +00:00
Julian Smart
cd1fa15598 Applied patch #15744: wxRichTextCtrl: HitTest can't find top-level floats (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-03 18:41:30 +00:00
Julian Smart
7541c7cb77 Apply fix for #15734: wxRichTextCtrl: A floating wxRichTextTable's cells aren't drawn (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-12-02 09:06:13 +00:00
Julian Smart
b8e9bf6f9c Fix for #15716: wxRichTextCompositeObject::Dump() should also dump the object itself? 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-28 16:29:59 +00:00
Julian Smart
d15f2b7385 Fix for #15715: NULL check required in wxRichTextBuffer::SetStyleSheetAndNotify() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-28 16:23:29 +00:00
Václav Slavík
47271dd99e fix GCC warning "logical ‘or’ applied to non-boolean constant" 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-24 17:20:02 +00:00
Julian Smart
6816e39ae7 Applied #15681: wxRichTextCtrl: Crash when deleting a wxRichTextTable row or column (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 21:50:44 +00:00
Julian Smart
048e3b6e67 Backported part of r75124: Generalised wxRICHTEXT_CHANGE_OBJECT command so it can now apply to a paragraph as well as an object within a paragraph. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 10:37:24 +00:00
Julian Smart
1b5478af74 Backported r75109: Corrected multiple cell property editing 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 10:32:38 +00:00
Julian Smart
1156bf0b13 Backported r75108: Fixed print preview glitch and vertical cell alignment. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 10:28:28 +00:00
Julian Smart
f510ad8b7c Backported r75107: Fixed selection bug. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 10:23:45 +00:00
Julian Smart
6565d0814e Backported layout fixes portion of r75105 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 10:20:25 +00:00
Julian Smart
3572387b7c Don't delete composite objects when defragmenting (backport of r75099 from trunk) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 09:43:03 +00:00
Julian Smart
b1fbde6261 Use specified height in a text box, if there is one 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-24 07:00:59 +00:00
Julian Smart
6539f8630e Fix selection drawing for table cells 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-21 13:12:16 +00:00
Julian Smart
ab3c08cb53 Corrected wxRTC IsDefault() implementations 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-20 17:42:06 +00:00
Julian Smart
09f3defad8 Avoid crash when deleting range that includes the focus object. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-20 17:19:32 +00:00
Julian Smart
736a9ccdfa Fixed some data transfer bugs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-18 19:27:06 +00:00
Julian Smart
ce9de939c7 Typo fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-16 18:19:19 +00:00
Julian Smart
409821d9ce Added wxTEXT_ATTR_UNITS_HUNDREDTHS_POINT for more precise border sizes; used GetPixels() more; corrected collapsed borders implementation. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-16 16:22:20 +00:00
Julian Smart
9e099ac6f2 Fixed calculation when cell widths are percentages. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-12 20:47:22 +00:00
Julian Smart
6fd94bb4ef wxRTC tables: improve collapsed border drawing by allowing cell borders at the edge if no overall border. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-11 14:43:58 +00:00
Julian Smart
e5510b8526 Corrected conversion of small dimensions to pixels 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-11 11:13:18 +00:00
Julian Smart
69a36314cd Use the correct attributes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-05 19:50:36 +00:00
Julian Smart
9dc7358017 wxRTC: fixed bug with columns with unspecified widths, and column spans, being sized too small 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-05 16:31:30 +00:00
Julian Smart
42b2ebfdbb Provide a fallback text colour for text in wxRTC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-05 16:15:12 +00:00
Julian Smart
a4f491405d Changed the capitalisation of 'span' of Set/GetRow/Colspan to be less jarring 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-05 15:35:05 +00:00
Julian Smart
f58377dde1 Implemented collapsed borders for wxRTC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-05 15:01:20 +00:00
Julian Smart
5d72892ebc Added conversion from points 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-04 12:34:41 +00:00
Julian Smart
070af26558 Corrected border drawing to avoid clipping 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-04 07:57:26 +00:00
Julian Smart
fc8a2ec1f6 wxRTC table layout now uses cell content to calculate column widths if no other widths specified 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-04 05:51:36 +00:00
Julian Smart
4b263e5ef3 Further refine of #15226: wxRichTextCtrl: Implement setting properties with undo for objects e.g. wxRichTextTable (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 16:33:24 +00:00
Julian Smart
21d0340384 Applied #15226 wxRichTextCtrl: Implement setting properties with undo for objects e.g. wxRichTextTable (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-10-01 15:47:49 +00:00
Julian Smart
d0b6c0c527 Applied #15226 with modifications: wxRichTextCtrl: Implement setting properties with undo for objects e.g. wxRichTextTable (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-29 16:08:03 +00:00
Julian Smart
b7348ed0cf Don't redraw borders for cells that are hidden - fixes drawing glitch in sample 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-29 14:01:16 +00:00
Julian Smart
af4168e2cf Added wxRichTextTableBlock class to help with table UI operations 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-29 13:35:58 +00:00
Julian Smart
787de84048 Fixed capitalisation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-29 13:11:01 +00:00
Julian Smart
92a98ecc53 Applied patch #15540: wxRichTextTable: crashes due to an invalid focus object (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-29 12:58:30 +00:00
Julian Smart
f7f8a13c04 wxRTC: fixed guidelines overwriting adjacent cell borders; corrected capitalisation in command labels; now sends text update event when an object is changed. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-27 13:36:46 +00:00
Julian Smart
3b9c5fe8b3 Corrected disabling of controls in cell editor. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-26 10:00:50 +00:00