Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,742 Commits 1 Branch 330 Tags
c302a8d1e7afbe03a4ba3f47d8ecebbd442498a3
Commit Graph

361 Commits

Author SHA1 Message Date
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
Julian Smart
d86b82bb2c Applied #13738: Make a wxRichTextImage's box display around the image (dghart) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-13 19:06:53 +00:00
Julian Smart
83c6ae8e25 Applied patch #13698 to fix wrong border test 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-05 09:59:51 +00:00
Paul Cornett
36307fdf51 remove unused variables 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-01 08:16:42 +00:00
Julian Smart
d3f6b1b575 Fixed problem with the size of paragraphs not needing layout not being taken into account when calculating overall box size. 
Should fix the problem with lines becoming insensitive to mouse clicks after adding a couple of shorter lines.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-10-30 17:28:03 +00:00
Julian Smart
031b5b0c2f Add indents to maximum size to prevent problems with paragraph layout (fixes #13458). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-10-30 13:34:43 +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
a3c125765f Buffer size calculation correction 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-31 13:11:14 +00:00
Julian Smart
8337ae1e40 Fix for image saving speedup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-25 16:42:02 +00:00
Julian Smart
4dc7ae1ae8 Speeded up image saving to XML (WriteHex). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-24 10:59:47 +00:00
Stefan Csomor
616c7cbd92 replace usage of objective-c keyword 'id' 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-16 07:16:10 +00:00
Julian Smart
0e190fa2b4 Fixed #13017: wxRichTextCtrl CopyToClipboard regression 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-06 09:09:42 +00:00
Julian Smart
52112306b0 Fixed a problem with paste resetting the content paragraph style. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-02 20:55:39 +00:00
Julian Smart
706465df1f Applied #12941: Fixes and enhancements for wxRTC (Robert Hoffman) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-25 11:37:20 +00:00
Julian Smart
fc5bebcef4 Corrected a hit test problem when tabs are present 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-20 12:05:13 +00:00
Julian Smart
8757ab3623 Fix for lines not wrapping soon enough if tabs are present 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-03 20:05:33 +00:00
Stefan Csomor
d67faa04d4 clang warnings 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-27 11:54:19 +00:00
Dimitri Schoolwerth
6636ef8ddf Use wxString's empty() when checking if the string is (non-)empty throughout wx. 
Instead of constructs such as if "( s.length() )" and "if (s.length() > 0)" use "if ( !s.empty() )" instead. Similarly for "if (s.length() == 0)" or "if ( s.IsNull() )", use "if ( s.empty() )".
No code changes intended except for a few instances where a construct like "if ( s.length() && wxFileExists(s) )" was changed to not check the length of the string and let wxFileExists handle such cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-22 14:38:36 +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
07d4142fc4 Fixed some problems with floating objects 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-18 12:32:02 +00:00
Julian Smart
c99f1b0fd6 Corrected wrong range in GetText 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-15 15:31:20 +00:00
Julian Smart
2be72ac283 Compile fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-14 12:08:03 +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
Paul Cornett
703e3c42d1 remove always-true tests of unsigned >= 0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-08 17:45:31 +00:00
Julian Smart
925a662ab0 Fixed bad rendering with tabs by correcting the position tabs are calculated from 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-21 11:11:25 +00:00
Vadim Zeitlin
377c1ba438 Return false, not NULL, from a function returning bool. 
Fix a warning (which might be an error with some compilers) about returning
NULL from bool wxRichTextImageBlock::DoMakeImageBlock() function.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-14 18:44:04 +00:00
Vadim Zeitlin
f7d83f24fb Don't check for wxDF_UNICODETEXT support in ANSI builds. 
wxDF_UNICODETEXT clipboard format can't be even constructed without provoking
an assert in ANSI build of wxGTK, so avoid using it, we don't support it
anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-10 13:53:27 +00:00
Vadim Zeitlin
8aab23a129 Initialize paragraph descent in wxRichTextParagraph::Layout(). 
This variable was used as the initial value for the descent but was never
initialized, so the descent computation could be completely wrong.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-11-10 13:53:22 +00:00
Julian Smart
5ad9ae3a29 Fixed #12566 (assert on deletion) due to inconsistent commit 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-14 18:06:02 +00:00