Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,851 Commits 1 Branch 330 Tags
d15f2b7385411a7d48b12ab5b992d5e0a7f57a24
Commit Graph

290 Commits

Author SHA1 Message Date
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
Julian Smart
4f2d6692c7 Make wxRichTextRectArray usable by other parts of wxRTC 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-23 09:07:16 +00:00
Julian Smart
057945a5cd Partial fix for #15196: wxRichTextCell caret issues (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-22 20:34:16 +00:00
Julian Smart
32c2b16dac Corrections to border placement 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-19 13:14:11 +00:00
Julian Smart
d9dd0c95df Second part of #15224 fix: AddRows, AddColumns (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-19 11:09:34 +00:00
Julian Smart
0cae0a4e18 Fix for #15224: wxRichTextTable: Setting a cell's text colour affects subsequent cells (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-19 08:38:48 +00:00
Julian Smart
9142a5ec3f Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-19 07:48:22 +00:00
Julian Smart
e0effd7e3b Ensure that the overall table border doesn't get overdrawn by cell borders with a different colour 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-18 08:18:32 +00:00
Julian Smart
fca66f5985 Crash fix for inserting text into a buffer without an associated control 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-08-29 11:41:48 +00:00
Julian Smart
fc63fb9aaf Applied #15393 (dghart) fixing wxRichTextTable for percentage widths 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-08-09 11:56:33 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword. 
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-26 16:02:46 +00:00
Vadim Zeitlin
7e81e3a796 Fix build with wxUSE_FFILE=0. 
Add the missing "#if wxUSE_FFILE" checks and add fallbacks to wxFile if it's
available.

Closes #15353.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-25 21:55:06 +00:00
Vadim Zeitlin
5d98e603bc Fix VC6 compilation of wxRichTextTable code. 
In addition to breaking VC6 build, the code also rather strangely declared
"row" inside a for loop first and then declared it in the function scope.

Leave just the second declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-29 12:53:21 +00:00
Julian Smart
8e77fd8bca Applied rowspan patch #15276 (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-25 15:38:46 +00:00
Julian Smart
8a28cd66a6 Applied colspan corrections, #15274 and #15275 (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-06-25 15:30:55 +00:00