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

74 Commits

Author SHA1 Message Date
Julian Smart
15ef465412 Fix for text parsing when the text object has properties 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-07-13 08:47:23 +00:00
Julian Smart
73312a5048 Backported colour/color consistency 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-17 21:55:05 +00:00
Julian Smart
ac448bc0a0 wxRTC: save and load the 'shown' status in case there's a situation where layout doesn't restore it 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-29 12:06:17 +00:00
Julian Smart
bd21f7eaf0 wxRTC: extracted XML utilities into a separate class for potential reuse. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-09-03 16:47:09 +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
Julian Smart
ad43a43fc2 Reverted format changes since 2.9 works differently 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-18 15:00:38 +00:00
Julian Smart
5a25574e82 String formatting fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-07-18 14:04:34 +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
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
c6182d489c Added custom properties to style definitions and style sheets 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-04-24 11:22:18 +00:00
Julian Smart
7e2cf46425 Removed unnecessary newlines. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-20 18:02:04 +00:00
Julian Smart
55e72ca5c4 Corrected missing angled bracket 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-20 17:57:56 +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
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
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
326c0adbfc Corrected XML conversion in style names and face names 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-04-04 17:56:53 +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
2865d42dd6 XML import corrections 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-15 13:20:00 +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
Julian Smart
32742d3d9d Compile fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-08 22:17:14 +00:00
Julian Smart
c06f56dd1a Blind fix for Mac compile problem 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-08 21:51:44 +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
5249673498 Fix for % symbols going missing from style parameter 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-12 16:16:48 +00:00
Julian Smart
dd71bfb992 Large image-loading speedup and small attribute-loading speedup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-17 10:10:39 +00:00
Julian Smart
a9a8cebc91 Fixed tab removal bug, and empty text element 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-11-11 10:59:14 +00:00
Julian Smart
59a87eeaf6 Fixed #9996 (incorrect XML output in Ansi build for non-ASCII character) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-22 13:06:42 +00:00
Vadim Zeitlin
43b2d5e7c3 Put braces around all calls to wxLogFunctions() inside an if statement. 
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-20 16:47:54 +00:00
Francesco Montorsi
7d76fbd5a1 use enumerations instead of integers for wxFont style/weight/family 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-16 20:46:20 +00:00
Julian Smart
9c4cb61167 Added font family to wxTextAttr 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-15 09:20:55 +00:00
Julian Smart
7ab9d2358b Fixed reading of image type 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-06 15:21:54 +00:00
Julian Smart
a2beab222f COnversion of some common font names to current platform 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-20 13:24:53 +00:00
Paul Cornett
f92ef8536a non-pch build fixes, after r53535 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-10 17:46:38 +00:00
Francesco Montorsi
d75a69e832 replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and wxMemoryFSHandler 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-10 09:40:33 +00:00
Julian Smart
d47018c761 Fixed quotation mark input/output 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-26 19:43:30 +00:00
Julian Smart
bb5b214dab Don't omit empty text objects 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-21 16:19:00 +00:00
Julian Smart
9dda10ae72 Fixed an XML parsing error for complex URLs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-16 12:09:48 +00:00
Julian Smart
8cc448d308 Image objects should load and save attributes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-25 12:10:43 +00:00
Vadim Zeitlin
6cced968cf use bgcolor when restoring styles as this is what we write, not backgroundcolor 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-19 03:42:05 +00:00
Julian Smart
44cc96a80c Merged wxRichTextAttr and wxTextAttrEx into wxTextAttr, and added a font table 
to wxRichTextBuffer to reduce wxFont consumption and increase performance.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-09 11:20:36 +00:00
Julian Smart
aa097547e9 Corrected typo affecting outline level reading 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-07 14:12:14 +00:00
Julian Smart
03cd212405 Fixed URL saving/loading 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-04 14:21:29 +00:00
Václav Slavík
288b6107e1 renamed wxXmlProperty to wxXmlAttribute, plus implied method names changes (bug #1751761) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-14 10:07:41 +00:00
Václav Slavík
8650108199 don't use implicit wxString->char*/wchar_t* conversion, it will not be available in wxUSE_STL build in the future 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-10 17:42:41 +00:00
Václav Slavík
4aae00c69c compilation fix for wxUSE_INTL=0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-02 20:35:03 +00:00
Julian Smart
87eaa6f666 Typo fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-05 08:45:15 +00:00