AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
52,568 Commits 1 Branch 0 Tags 297 MiB
1b3b63ed5b
Commit Graph

73 Commits

Author SHA1 Message Date
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
f5b7586bfe Removed redundant GetEditableWindow on GTK+ 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-04 09:27:52 +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
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
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
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
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
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
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
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
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
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
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
c2a4fabb14 Made wxRichTextCtrl cursors accessible 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-27 08:54:55 +00:00
Julian Smart
cd8ba0d9e4 Added a reset-buffer event to give an opportunity to set the default initial style 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-01 14:14:44 +00:00
Vadim Zeitlin
c058cafa56 don't use DECLARE_EVENT_TYPE() to avoid confusing people about its unused value parameter, declare the event type constants directly 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-27 13:21:39 +00:00
Julian Smart
97f3b1e939 Added event handler macro 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-22 08:23:31 +00:00
Vadim Zeitlin
17808a7596 move Freeze() and Thaw() to wxWindowBase to ensure that they behave consistently (i.e. recursively, as described in the docs) in all ports; removed different duplications of freeze count from derived classes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-05 00:21:31 +00:00
Julian Smart
52170c5b44 Fixed context menu in wxRichTextCtrl 
Added colour change event handler to wxRichTextCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-27 16:59:24 +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
Vadim Zeitlin
0ec1179b86 added wxTextEntry common base class for both wxTextCtrl and wxComboBox; refactor wxGTK code to put common parts of these classes in the base class; fixed some inconsistencies in the text control behaviour between platforms 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-26 00:30:22 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Julian Smart
61f84e2493 Process capture lost event to avoid assertion 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-29 19:37:04 +00:00
Julian Smart
ff76711fbe Fixed a bug setting caret position after setting or clearing selection 
Implemented forced line breaks within a paragraph, entered with Shift-Return.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-20 11:33:44 +00:00
Julian Smart
12cc29c56a Small cleanup. 
Set caret position when calling SetSelection.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-18 22:27:48 +00:00
Julian Smart
5912d19ef7 Removed obsolete code 
Added some more event types
Added back GetStyleForRange


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-17 14:28:47 +00:00
Julian Smart
7d5232b815 Removed new function 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-16 07:33:19 +00:00
Julian Smart
c7134e1c9c Made new functions non-virtual 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-15 23:03:18 +00:00
Julian Smart
a7ed48a590 Small bug fixes 
Added GetStyleForRange to wxRichTextCtrl
HasCharacter/ParagraphAttributes range now consistent with other functions in wxRichTextCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-15 15:59:06 +00:00
Julian Smart
4e8d95587c Add ctor parameters to match wxTextCtrl 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-08 18:51:03 +00:00
Julian Smart
ea160b2e92 Reuse wxCaret object 
Add page break specification
Optimize drawing after character input


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 17:51:38 +00:00
Julian Smart
d2d0adc776 Added URL support to attribute objects and to wxRichTextCtrl, 
generating a wxTextUrlEvent as appropriate.
Added outline list support and updated previews.
Added alignment support for bullets.
Added single right parenthesis support.
Added XML stylesheet reading/writing.
Changed SetBulletSymbol to SetBulletText so it can support
bullet text more generally (e.g. for cached outline list numbering)
Added wxRichTextRenderer to isolate e.g. bullet drawing and make
it customisable.
Added event handler support to wxRichTextBuffer.
Updated documentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-26 06:32:47 +00:00
Julian Smart
f089713f9e Added the ability to use built-in bullet styles, currently standard/circle or standard/square. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-20 13:04:12 +00:00
Włodzimierz Skiba
41a852156f Whitespaces and headers cleaning. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-20 07:48:31 +00:00
Julian Smart
dadd4f5523 Added a list style editor page to the formatting dialog. 
Added a style organiser dialog, which can be used to browse
for and apply styles and can be limited to show one of
the three style types, or all three.
Added a font name cache since it's an expensive operation
that's used frequently by the rich text dialogs.
Added ability to switch off tooltips for new dialogs
(off by default). Improved the previews. Pressing tab or shift-tab
at the start of a list item now demotes or promotes the item.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-19 14:04:13 +00:00
Julian Smart
38f833b10c Added list style to text attributes, independent from paragraph style 
Added list style definition
Added SetListStyle, ClearListStyle, NumberList, PromoteList to
buffer and control classes
Changed style listbox so double-click applies style instead of
single click. This allows for multiple items to be applicable,
and also in future to edit styles from this listbox without
accidentally applying the style to content.
Added wxRichTextStyleListCtrl which also shows a wxChoice for
selecting the type of style to display.
Style sheets can form a chain to allow inheritance from current
style sheet (not yet supported by style list controls).
Added PushStyleSheet/PopStyleSheet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-17 14:09:14 +00:00
Julian Smart
1807a1f3cf Return type change 
Added support for help button to formatting dialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-10 17:01:36 +00:00
Vadim Zeitlin
343ae70d4c fix compilation after recent wxTextCtrl changes 
notice that it has become unfortunately impossible (or at least much more
difficult) to maintain compilation when wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE
is unset so I simply removed it as the code wouldn't compile anyhow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 22:42:20 +00:00
Julian Smart
3e3a754f9c Don't use double buffering on platforms that do it automatically. 
Filters out unrecognised keycodes in OnChar, and added numeric
keypad navigation keycodes.

Added SetStyleEx which takes flags for specifying option such
as optimization (only apply necessary styles), char/para style
only, and use undo. Used SetStyleEx when applying styles to
avoid applying character styles to paragraph objects, and vice versa.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 14:00:04 +00:00