Commit Graph

171 Commits

Author SHA1 Message Date
Vadim Zeitlin
00fe363361 Remove interface/implementation #pragmas from richtextimagedlg.*.
These pragmas are not necessary and may actually be harmful, no idea why were
they added in the first place to a new file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:30:58 +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
Vadim Zeitlin
2cd36ea032 Don't compile platform-specific methods when using wxUniversal.
Various wxTextEntry::GetEditXXX() methods shouldn't be used in wxUniv build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-14 22:43:19 +00:00
Vadim Zeitlin
6dc6bcd8ab No real changes, just fix unused parameter warning.
Wrap dc parameter of wxRichTextCtrl::PaintAboveContent() in a WXUNUSED().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-11 10:44:27 +00:00
Julian Smart
35bdbae572 Added PaintAboveContent function for drawing on top of text (#12176)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-25 14:05:07 +00:00
Francesco Montorsi
a0e9a5dfde Implement wx-prefixed macros versions of DECLARE_EVENT_TABLE, BEGIN_EVENT_TABLE* and END_EVENT_TABLE macros.
Implement compatibility aliases for non-prefixed macro names.
Require a final semicolon where possible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-09 14:28:08 +00:00
Julian Smart
02aa812cb0 wxRTC: fixed style selection reset after editing a style.
wxRTC: can now edit line spacing in .1 increments from 1 to 2.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-27 16:09:22 +00:00
Julian Smart
9302396589 Made Unicode the default in symbols dialog.
Fixed wrongly sized symbols dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-23 09:34:07 +00:00
Julian Smart
8e43fc7776 Context menu now created in constructor; old context menu deleted when new one set.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-29 06:45:36 +00:00
Julian Smart
c631741b39 Fixed compile problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-24 06:48:27 +00:00
Julian Smart
4fdc2c5f2a Added wxRICHTEXT_HANDLER_USE_CSS flag for HTML handler to use CSS
where possible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-23 11:05:52 +00:00
Julian Smart
2f0baf9797 Resolved #4842 (accessors for member variables)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-23 08:15:13 +00:00
Julian Smart
749414f70f wxRTC's own caret is more reliable than the generic one, so use it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-14 15:52:48 +00:00
Jaakko Salli
0847e36eff wxTextEntry::SetMargins(), GetMargins() - implemented on wxMSW and wxGTK (GTK+ 2.10+); also added similar functions into wxComboCtrl, deprecated old indent-functions; wxPropertyGrid modified to use the new functionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-05 12:39:12 +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
Julian Smart
a188ac2988 wxRichTextCtrl native caret now flashes, for wxMac/Core Graphics mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-17 21:10:04 +00:00
Julian Smart
50283a5142 Added background colour control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-15 11:20:38 +00:00
Julian Smart
c187b47244 Don't translate panel titles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-24 19:09:52 +00:00
Julian Smart
5bf3b6fe48 Fixed small alignment issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-24 19:06:19 +00:00
Vadim Zeitlin
5eb34e9eb0 compilation fix for wxMotif and wxGTK1 (of course, it will still crash at run-time, just as for the other ports but hey, it compiles)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-22 21:42:08 +00:00
Julian Smart
d35146fa5d Removed conflicting virtual function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-06 08:19:31 +00:00
Vadim Zeitlin
805c8d92b9 wxOSX build fix for wxRichTextCtrl after wxTextEntry::GetValue() renaming to DoGetValue()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-02 20:43:12 +00:00
Vadim Zeitlin
586a789446 compilation fix after GetEditableWindow() signature change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-02 16:22:30 +00:00
Vadim Zeitlin
63f7d5022e added wxTextEntry::SetHint() (a.k.a. cue banner or placeholder string)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-02 12:25:01 +00:00
Julian Smart
128fae4632 Compile fix under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-27 17:15:57 +00:00
Julian Smart
f51723055a Fixed wxRichTextCtrl base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-27 10:54:12 +00:00
Julian Smart
e0983733bd Fixed wxRichTextRange != operator
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-12 10:17:44 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +00:00
Vadim Zeitlin
9b11752c4f require semicolon after wxDECLARE/DEFINE_EVENT() (closes #10456)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-07 18:59:25 +00:00
Vadim Zeitlin
7ad24ad9cf don't use _() in the public header in case WXINTL_NO_GETTEXT_MACRO is defined (closes #10132)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 14:40:43 +00:00
Julian Smart
e9f1000463 wxRTC now properly honours margin size
Added wxRE_CENTRE_CARET style to centre the caret line vertically


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-21 12:06:21 +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
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
Vadim Zeitlin
3c77890141 add more flexible and safer template Connect() overloads (#10000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-12 14:26:13 +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
Vadim Zeitlin
42632bcee1 fix MSVC /Wp64 warning about size_t to int conversion (closes #10068)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-31 17:14:12 +00:00
Francesco Montorsi
f632e27b3f group hit-test flags into an enum (like I did in docs); this makes easier to document them, but is also logically the best thing since wxRichTextBuffer::HitTest is documented to return only _one_ of those flags.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-10 19:13:50 +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
afb0d55c83 Fixed default margin sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-21 16:08:32 +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
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
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
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
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
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
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
Francesco Montorsi
25af884d93 fix header files so that they can be included directly without generating 'undefined reference' errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-20 18:11:26 +00:00