Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,478 Commits 1 Branch 330 Tags
374db28747a90bdced3ad05005e5d5ef406cbc18
Commit Graph

352 Commits

Author SHA1 Message Date
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
Julian Smart
8995db52f3 Don't use wxDC in header 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-06 21:27:07 +00:00
Julian Smart
bec80f4f4a Eliminated redundant wxRichTextAnchoredObject class; refactored XML I/O code 
so that objects can stream themselves; added a wxXmlDocument-based method
of writing XML, though this turned out to be much slower than writing directly
so the direct approach is retained and is the default (can be changed with wxRICHTEXT_USE_XMLDOCUMENT_OUTPUT).
Loading and saving new attributes implemented. Added custom properties to objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-06 20:22:03 +00:00
Julian Smart
2477747881 wxRTC no longer derives from wxTextCtrlBase; added wxRichTextAttr deriving from wxTextAttr 
with CSS-like attributes for future developments; removed image-specific attributes object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-04 08:37:31 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace. 
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 11:44:45 +00:00
Vadim Zeitlin
cdaed652d7 Merge of SOC2010_RTC_IMAGES branch. 
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 10:27:07 +00:00
Julian Smart
d13a8e05c2 Fix bug finding line after line break 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-23 16:24:04 +00:00
Julian Smart
8f0e43661a Fixed wrong line spacing calculation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-30 11:27:42 +00:00
Julian Smart
602a592c22 Don't add space before para twice in paragraph layout 
Discard attributes from empty text object when merging


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-30 08:47:23 +00:00
Julian Smart
a94656538f Use common inline version of wxHexToDec 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-18 12:59:52 +00:00