Commit Graph

214 Commits

Author SHA1 Message Date
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
cd72035387 Added box style functionality to style manager dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-04 19:38:31 +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
0c0e063e66 Applied #13819: wxRTC drag and drop, by dghart, with tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-03 14:09:34 +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
9b794421ae Split up the context menu functionality to make it easier to customise.
Tweaked style combobox popup border.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-30 17:12:37 +00:00
Vadim Zeitlin
b099835e8f Fix typo in wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK in documentation.
It was misspelt as wxEVT_COMMAND_RICHTEXT_DLEFT_CLICK.

Closes #13802.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 15:43:01 +00:00
Julian Smart
c1431e59e3 Applied #13803: wxRichTextCtrl: missing event-table macro (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 11:39:40 +00:00
Julian Smart
4f51b983c2 Fixed #13535: wxRichTextCtrl: Incorrectly documented or named functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-31 12:15:05 +00:00
Julian Smart
75936ec600 Applied patch #13534: wxRichTextCtrl: Make it easier to use TextEffects flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-22 13:19:40 +00:00
Vadim Zeitlin
abfdefede3 Add wxWithImages helper mix-in with {Set,Get,Assign}ImageList() methods.
Avoid defining SetImageList() in several different places in wx API as not
only this resulted in (trivial) code duplication but this method also had
different semantics before: it didn't take ownership of the pointer passed to
it in wxTreeCtrl, wxListCtrl and wxBookCtrl and derived classes but did take
its ownership in wxDataViewTreeCtrl and wxRichTextFormattingDialog.

Harmonize this for all the classes now: SetImageList() never takes ownership
while AssignImageList() (which is now available in all classes having
SetImageList()) always does.

Also add convenience wxWithImages::GetImage() helper to avoid (more) code
duplication in wxDataViewTreeCtrl code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:08:43 +00:00
Julian Smart
3c6cc33082 Added the ability to deselect attributes in the font dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-10 14:06:28 +00:00
Julian Smart
4c7d9d88b7 Added Page Break control to spacing page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 12:31:44 +00:00
Vadim Zeitlin
decd390a32 Work around bogus g++ warnings about possibly missing return.
OS X g++ warned that "control may reach end of non-void function" in
wxRichTextHelpInfo::ShowHelp(). This wasn't really the case but change the
function logic slightly to (hopefully) suppress the warning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-30 12:20:47 +00:00
Vadim Zeitlin
48dd005569 Replace more DECLARE_CLASS occurrences with DECLARE_DYNAMIC_CLASS.
Correct more mismatches between DECLARE_CLASS and IMPLEMENT_DYNAMIC_CLASS
usage.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 16:48:36 +00:00
Vadim Zeitlin
80e2b03182 Use DECLARE_DYNAMIC_CLASS instead of DECLARE_CLASS.
Correctly use DECLARE_DYNAMIC_CLASS for the classes that are supposed to be
dynamically creatable as using DECLARE_CLASS doesn't work any longer after the
last commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-07 14:28:55 +00:00
Julian Smart
71185527a0 wxRTC doc updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-11 16:45:34 +00:00
Julian Smart
7afd2b58c5 More work on improving wxRTC documentation, copied buffer and control headers to interface folder.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-08 18:29:51 +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
Vadim Zeitlin
8a95db3429 Translate various user-visible strings in rich text print code.
Make default wxRichTextPrintout title and the name of wxRichTextPrinting
object translatable.

Closes #13187.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-01 15:58:36 +00:00
Julian Smart
987695522c Added ForceDelayedLayout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-21 12:44:26 +00:00
Julian Smart
b3169c12bc Further commenting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-04 17:55:56 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos.
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-03 20:31:32 +00:00
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files.
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-20 00:14:35 +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
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
23bdfeee49 Small doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 19:32:54 +00:00
Julian Smart
bcc372381f Removed GCC 4 warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-14 19:32:35 +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
ec96ef0b6f fix GCC warning about not explicitly initializing base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-08 17:55:53 +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
6ffb5e91ea Exports fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-04 12:25:27 +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
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
6255fac96f Use Unix EOL format for the new files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:31:57 +00:00
Vadim Zeitlin
7132641de7 Include correct headers from richtextimagedlg.*.
Include or forward declares the classes used by the header to make it
self-contained. Do not include wx/wx.h from the source file to make compiling
it faster when not using PCH.

This fixes compilation under Unix after SOC2010_RTC_IMAGES branch merge.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:31:04 +00:00
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