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
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
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
bbd55ff956 Don't reset bullet number and outline number when applying style sheet. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-03 17:15:33 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible. 
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-20 18:18:23 +00:00
Julian Smart
205a1ad98f Fixes for incorrect selection, extra newline insertion when undoing deletion of selection, 
incorrect SetScrollbar optimization, insufficient refresh for operations on last line,
HasCharacter/ParagraphAttributes bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-02-02 22:19:33 +00:00
Julian Smart
76d7fc2904 Simplify SetSelectionRange and make consistent with SetSelection. 
Fix a bug that returns true for character and paragraph style tests if no characters or paragraphs were found.
Fix SetSelection to position caret at end.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-02-01 10:45:51 +00:00
Julian Smart
476a319a8f Applied #11238: Wrong text positioning if fonts with different Ascent/Descent ratio are on the same line 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-25 11:14:11 +00:00
Julian Smart
0d6ca1c2f6 Fix for wrong line placement when centering or right-aligning 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-23 07:38:42 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space. 
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-21 10:41:26 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT(). 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 20:30:22 +00:00
Vadim Zeitlin
af58844636 Add information about the log message generation location to wxLog. 
This means that wxLog::DoLogRecord() can now retrieve the file name, line
number and the function where the message was logged.

An unfortunate consequence of this change is that now

	if ( condition )
		wxLogError("Whatever");

results in a warning from g++ 4.x with -Wparentehses, so extra parentheses had
to be added in many places.

Finally, also allow storing arbitrary attributes in wxLogRecordInfo. This had
to be added to implement our own overloaded wxLogStatus() and wxLogSysError()
and will probably be useful for the others as well.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-09 20:26:34 +00:00
Julian Smart
04529b2af2 Made standard bullet names translatable 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-24 10:28:20 +00:00
Julian Smart
015d04462f Patch from Bruno Daniel to fix tab position inconsistency 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-20 23:26:20 +00:00
Vadim Zeitlin
4b6a582bef replace more __WXDEBUG__ occurrences with wxDEBUG_LEVEL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-22 12:53:48 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +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
4ab8a5e2f1 Fixed [wxRichTextCtrl] Right Alignment sets text in the RTC too close to the border (#10277) 
Also [wxRichTextCtrl] Wrong text positioning if different font sizes in the same paragraph (#10279)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-10 14:55:52 +00:00
Francesco Montorsi
a51e601e17 s/wxGetTempFileName/wxFileName::CreateTempFileName 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-07 01:01:35 +00:00
Julian Smart
43a0d1e1e9 Compile fix 
Centre/right justification fix when there is a right indent


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 16:04:55 +00:00
Julian Smart
34b4899df5 Fixed centering and right-justification when combined with left indentation (bug #10221). 
Fixed wrapping problem for long lines (bug #10149).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 15:53:13 +00:00
Vadim Zeitlin
62891c875f comparison of wxBitmapType with -1 is useless as it can never be true; assume wxBITMAP_TYPE_INVALID was meant here 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-14 23:09:04 +00:00
Francesco Montorsi
046fce4786 fixed a bug caused by passing a wxChar[] buffer to a function taking a wxString; the buffer was automatically converted but since it was not NULL-terminated, a crash resulted 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-09 17:00:32 +00:00
Julian Smart
5cb0b827f1 Switched off some buggy optimisation that caused caret positioning/drawn text mismatch. 
Fixed defragmentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-16 10:58:32 +00:00
Julian Smart
e2d0875aa7 Improved auto list numbering 
Fixed selection bugs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-22 15:21:50 +00:00
Julian Smart
043c0d5843 Shift+Return now puts the cursor on the next line 
Fixed GetContiguousPlainText bug that caused wrapping problem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-13 12:13:38 +00:00
Julian Smart
9c8e10ad37 Out by one correction 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-04 06:14:59 +00:00
Julian Smart
f1d800d91e Fixed a bug preventing style resetting to occur 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-18 17:03:53 +00:00
Julian Smart
d1e5be0ec6 Fixed common style collection and superscript/subscript selection 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-17 17:54:11 +00:00
Paul Cornett
2a23042680 fix some warnings from GCC -Wextra 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-15 17:24:48 +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
71d8e824aa Apply previous paragraph style if pasting plain text, but not if pasting rich text. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-09 08:47:08 +00:00
Julian Smart
1c13f06e4e Added a wxRichTextCtrl-specific caret implementation in case of need 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-29 09:10:32 +00:00
Julian Smart
affbfa1f29 Bug fix for empty objects 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-27 17:17:18 +00:00
Julian Smart
7051fa4161 Further wxRichTextCtrl performance improvements 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-27 13:29:53 +00:00
Julian Smart
4f3d5bc061 Made performance acceptable for editing large paragraphs on low-powered machines 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-24 14:39:33 +00:00
Julian Smart
109bfc88a4 Further optimizations 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-24 11:43:39 +00:00
Julian Smart
2f45f5545f Further performance optimizations 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-23 15:01:33 +00:00
Julian Smart
72945e2434 Two bug fixes for FindWrapPosition 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-22 07:57:28 +00:00
Julian Smart
31778480a9 Speeded up wrapping (again), this time using partial text extents. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-21 15:26:27 +00:00
Julian Smart
bf104bf71b Fix for slow first character insertion 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-20 19:08:19 +00:00
Julian Smart
30bf763039 Added wxRichTextCtrl superscript and subscript support (Knut Petter Lehre). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-10 14:05:44 +00:00