Commit Graph

52 Commits

Author SHA1 Message Date
Julian Smart
3956d02ab6 Scrolling improvements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-04 15:35:34 +00:00
Julian Smart
27e20452c4 SetStyle/GetStyle corrections
Added compatibility ctor to wxTextAttrEx
wxRichTextCtrl should take a string value for wxTextCtrl compatibility


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 21:13:18 +00:00
Julian Smart
05b4fddf49 Implemented wxTextAttrEx::CombineEx and wxRichTextAttr::Combine
Setting the default style now combines the default with the
new style, instead of just overriding it, so it is possible to
select e.g. bold and italic simultaneously in the sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-02 13:43:42 +00:00
Julian Smart
563d25babe Need to convert from physical to logical units inside HitTest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-01 16:43:54 +00:00
Julian Smart
7f0d9d717d Added support for tabs in wxRichTextCtrl (Ashish More)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-28 10:57:20 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
88a7a4e10e Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-25 14:38:19 +00:00
Włodzimierz Skiba
40989e46b8 [ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifications and rebaked build files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-24 14:52:23 +00:00
Julian Smart
d5363f57fb Make an image block beore writing it, if there's no data in the block
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 18:37:09 +00:00
Julian Smart
dd456db5e6 Applied patch [ 1463711 ] wxRichTextCtrl fix for pasting text
(too many linefeeds).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 13:33:48 +00:00
Vadim Zeitlin
99257cbe01 don't let the user modify the contents of read-only control (modified patch 1463707)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 16:22:42 +00:00
Włodzimierz Skiba
faa94f3ec8 Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprecate old ids, remove rest of build problems with case statemets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 12:25:17 +00:00
Vadim Zeitlin
0cc70962a1 Made wxList::compatibility_iterator a class in wxUSE_STL == 0 case too instead
of a simple typedef to "Node *" to be able to initialize it with NULL in ctor
which makes the behaviour of the code with and without wxUSE_STL the same.


The price to pay is that the code like

	wxList:compatibility_iterator ci;
	ci = cond ? list->GetFirst() : wxList::compatibility_iterator();

doesn't compile any more and has to be replaced with (more clear anyhow)

	wxList:compatibility_iterator ci;
	if ( cond )
		ci = list->GetFirst();


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 14:05:11 +00:00
Vadim Zeitlin
d0c3476bd6 correct gcc print format warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:20:29 +00:00
Vadim Zeitlin
f120af9d56 use wxCHECK instead of wxASSERT to avoid crashing later (coverity checker CID 19)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:09:37 +00:00
Julian Smart
21e354f107 Applied patch [ 1445031 ] wxString passed as ellipsis argument in richtexthtml.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 20:40:31 +00:00
Julian Smart
2dec67617f Added conversion to HTML, by Akin Demirtug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 14:48:17 +00:00
Vadim Zeitlin
a3a4105df6 it is not possible to show/hide the window from the UpdateUI event handler; refactored the code by moving control-specific parts into the derived classes (patch 1338350)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 16:32:50 +00:00
Michael Wetherell
8d7eaf9140 Warning fixes for VC5 (Igor Korot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:16:56 +00:00
Julian Smart
f9ed2d1680 Scroll text into view when typing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 13:05:30 +00:00
Vadim Zeitlin
648d8a8720 fixed VC7 unreachable code warning (given even in debug build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-01 01:47:19 +00:00
Julian Smart
b71e9aa4e2 Separated XML and HTML rich text I/O handlers
Cleaned up XML I/O
Added HTML handler to build system
Added encoding member for saving files output


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:31:07 +00:00
Julian Smart
63886f6d98 Fixed bug introduced by compiler compatibility fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:25:21 +00:00
Michael Wetherell
4c9847e14e Small fixes to allow compilation with --enable-stl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 02:03:40 +00:00
Dimitri Schoolwerth
412e0d47c0 applied patch #1356901 "Yet another removal of extra semicolons", also fixed remaining similar cases of extra semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 21:55:35 +00:00
Włodzimierz Skiba
caae22fb66 eVC4 warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 21:42:01 +00:00
Włodzimierz Skiba
41e155b43e eVC4 warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 20:44:43 +00:00
Julian Smart
fcdbeefa4e Applied patch [ 1341085 ] richtext xml build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 14:27:53 +00:00
Julian Smart
b01ca8b6a9 Applied patch [ 1339882 ] richtext misc cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 14:24:04 +00:00
Julian Smart
0bab774ba3 Fixed warnings/errors and changed Thaw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 17:51:10 +00:00
Julian Smart
76bcd8154c Don't clear background in Refresh (to suit poor implementations of Refresh)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 10:41:38 +00:00
Julian Smart
2f36e8dce5 Now works when derived from wxTextCtrlBase, using wxScrollHelper.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 13:44:30 +00:00
Julian Smart
09f1410821 Corrections for wxUSE_STL=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 11:40:32 +00:00
Julian Smart
9e31a66087 More Erase substitutions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 09:24:49 +00:00
Julian Smart
11ef729d54 Added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 09:20:09 +00:00
Julian Smart
efbf673503 Replace node deletion with Erase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 08:05:19 +00:00
Włodzimierz Skiba
39a1c2f2dd wxTinderbox build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 07:45:54 +00:00
Julian Smart
d21423356e Don't try to open clipboard if already open
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 20:43:02 +00:00
Julian Smart
c59f6793fb Reduced unnecessary painting; delete/recreate caret as WIN32 requires
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 20:04:53 +00:00
Julian Smart
ff2baa25d5 Switched antialiasing off since GetTextExtent doesn't work properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 16:31:07 +00:00
Julian Smart
7383cf9d17 Fixed warning, move caret in OnPaint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 14:50:29 +00:00
Julian Smart
4e09ebe880 Restored code uglies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:54:15 +00:00
Julian Smart
dc043de063 Removed macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:14:16 +00:00
Julian Smart
4d551ad5e5 Fixed some styling bugs, optimized resize for large files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:02:15 +00:00
Julian Smart
169adfa9c4 Resets scroll position on load
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 22:51:57 +00:00
Włodzimierz Skiba
e191ee8751 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 14:40:47 +00:00
Julian Smart
1e967276d8 Efficiency measures; file loading bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 12:55:53 +00:00
Julian Smart
3811368401 Introduced invalidation of ranges for later optimization code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 22:20:12 +00:00
Włodzimierz Skiba
7fe8059f58 const consistent for Clone(). Load/Save split to DoLoad/DoSave. Build fixes, warning fixes and other source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 17:00:58 +00:00
Julian Smart
2c375f42cf First part of a layout optimization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 14:44:15 +00:00