Commit Graph

90 Commits

Author SHA1 Message Date
Robin Dunn
9e96e16fe0 Apply patch (plus some additional changes) upgrading Scintilla to version 2.03. Closes #11765, #11748, #11346
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-30 03:50:06 +00:00
Vadim Zeitlin
3396739da1 Refactor wxStyledTextCtrl to share common file save/load code.
Keep the code for saving and loading text contents from files in a single
place instead of doing it differently in wxTextCtrl and wxStyledTextCtrl.

This required adding Set/GetValue() methods to wxTextAreaBase just so that its
DoLoad/SaveFile() could use them, even if they are the same as wxTextEntryBase
methods and are overridden in wxTextCtrlBase to be implemented in terms of the
latter.

Notice that wxRichTextCtrl might need to be refactored to use this code too in
the future.

Also notice that this reverts the change of r62081 which replaced SetValue()
with ChangeValue() in DoLoadFile() as wxTextAreaBase only has SetValue() and
it's not worth adding ChangeValue() to it too just to preserve this recent
change in behaviour.

Closes #10715.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-26 13:26:16 +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
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
23318a5358 declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 22:16:14 +00:00
Robin Dunn
fa70ec2b51 Consolidate old and new implementations of Get/SetSelection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-25 16:10:27 +00:00
Vadim Zeitlin
fafd43c578 another 64 bit fix: make SendMsg() return wxIntPtr instead of long too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-15 14:17:35 +00:00
Vadim Zeitlin
b796ba3931 fixed STC under Win64: as wxStyledTextCtrl::SendMsg() used (32 bit) long arguments, passing (64 bit) pointers to it almost certainly didn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-15 13:56:59 +00:00
Vadim Zeitlin
949750de63 fix off by 1 error in GetTextRaw() (#4317)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-15 12:08:52 +00:00
Vadim Zeitlin
609577038a ignore mouse wheel events which are coming too fast to be processed (#9057)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-15 11:31:31 +00:00
Vadim Zeitlin
2bfca191bf derive wxSTC from wxTextAreaBase to provide wxTextCtrl-like methods (see #9114)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-15 00:59:38 +00:00
Vadim Zeitlin
a5c2ccf2e7 state clearly that the entire contents of generated files is generated; put special {{{ and }}} markers around the generated sections (these are special and extra-convenient for ViM but can probably be used to at least go to the end/beginning/other extremeity of the generated block from any other decent editor)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-14 18:33:03 +00:00
Vadim Zeitlin
8e0945dae5 translate Scintilla getters to const methods of wxStyledTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-14 15:59:07 +00:00
Robin Dunn
5e328f3879 Use SetCanFocus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-27 21:23:56 +00:00
Robin Dunn
7e0c58e92c Update Scintilla to version 1.75
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 04:07:00 +00:00
Robin Dunn
4c784823a6 include private.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-03 03:13:49 +00:00
Paul Cornett
29825f5fc4 add wxUSE_STC wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-17 05:48:09 +00:00
Robin Dunn
54429bb380 Bakefile and other changes for new locations of STC and wxSVGFileDC.
Remove old files in contrib.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-05 06:27:23 +00:00
Robin Dunn
a0421c774c Always use wxHSCROLL|wxVSCROLL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-02 21:15:27 +00:00
Vadim Zeitlin
4358b585f1 blind fix for Unicode key handling (patch 1615989)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-01 15:19:44 +00:00
Robin Dunn
0daf5e6be2 Fill in more details for the wxEVT_STC_AUTOCOMP_SELECTION event
(ported from 2.8 branch)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-06 21:11:45 +00:00
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 08:50:17 +00:00
Robin Dunn
1c930beb60 Applied patch from Armel Asselin that reduces memory required when
pasting text and when sending events.

Comment out some unneeded asserts.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-28 19:32:18 +00:00
Robin Dunn
1e9bafca0f Updated to Scintilla 1.67
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 01:48:03 +00:00
Włodzimierz Skiba
d66551669c #include markup fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 08:36:08 +00:00
Robin Dunn
c5bd09bf48 Oops, that should be GetEncoding, not GetDefaultEncoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-21 20:35:06 +00:00
Robin Dunn
af0531a5a8 Use the encoding in StyleSetFont too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-21 20:29:59 +00:00
Robin Dunn
3727c043a8 Allow to set a style's wxFontEncoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-19 22:30:40 +00:00
Robin Dunn
41a499cd92 Add several "Raw" functions for setting/getting text from the document
buffer. They behave similarly to the same methods without the "Raw" in
the name, except they don't use wxStrings.  This can save some
conversions to/from unicode and utf-8 in a Unicode build.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-16 04:53:01 +00:00
Robin Dunn
a48cb41599 Patch #1183952, Create to return bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-15 19:41:32 +00:00
Robin Dunn
e4f39334ab No longer a need for changing the names to protect against multiple definitions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-15 18:55:16 +00:00
Robin Dunn
f9ee2e2742 rearrainge the #includes and etc. to avoid a name conflict with some
CoreFoundation headers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-30 18:39:54 +00:00
Robin Dunn
1b14227e64 Reduce the value of the fkey guard for unicode characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-02 21:35:50 +00:00
Robin Dunn
5fd656d503 Use the unicode character, if available in the event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-04 18:48:09 +00:00
Włodzimierz Skiba
a5b274d7fc Correct way of modyfing stc.cpp. Thanks Robin for quick guide :-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-07 19:49:27 +00:00
Robin Dunn
ccfc3219db When using an external scrollbar ensure that the built-in one is set
at minimal values so it won't be displayed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-10 19:58:49 +00:00
Robin Dunn
dc8005e206 TRUE/FALSE/etc. cleanup in the *.in files, regenerated the .h and .cpp
files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 23:36:33 +00:00
Robin Dunn
28e0c28ee3 On the Mac the Alt key is a character modifier like Shift, so let char
events with AltDown proceed into Scintilla.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 00:13:53 +00:00
Robin Dunn
5ee1d7604b Allow style spec strings to contain colour names as well as hex values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-27 21:17:01 +00:00
Robin Dunn
8ae4f08661 Set minsize and implement DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-11 18:11:30 +00:00
Robin Dunn
ec830416c5 This workaround is no longer needed because of fix in
wxWindowMac::MacWindowToRootWindow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-14 22:05:52 +00:00
Robin Dunn
719ee9c389 Take care of some focus issues with the AutoComp list box and also a
crash at exit when losing focus.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-10 00:09:27 +00:00
Robin Dunn
be698f5030 remove EVT_STC_POSCHANGED as it's been deprecated in Scintilla for
several releases now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-01 21:26:42 +00:00
Julian Smart
be5a51fb59 More name changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 11:20:37 +00:00
Robin Dunn
9efe0302c3 Check that the file successfully loaded, use the length read for the conversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-29 20:01:16 +00:00
Robin Dunn
1c26fbe00e Ensure the buffer is NULL-terminated before converting it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 18:35:35 +00:00
Robin Dunn
2548474612 Expand the range of WXK_ values that are excluded from OnChar.
Correct the position of the context menu.  (SF# 921247)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 18:22:54 +00:00
Robin Dunn
b6bfd8e8f4 Call Skip from the focus handlers so wxGTK can still do it's internal housekeeping
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-13 19:06:02 +00:00
Robin Dunn
d1558f3d53 Use extraFontFlag to specify if anti-aliased fonts should be used.
Use GetPartialTextExtents.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-11 22:42:01 +00:00
Robin Dunn
8e54aaedb5 Updated Scintilla to version 1.58
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-06 00:03:13 +00:00