Commit Graph

132 Commits

Author SHA1 Message Date
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
1d84348c5a Add support for horizontal mouse wheel scrolling in wxSTC.
Handle horizontal mouse wheel scrolling events in a similar (but simpler, as
they always scroll and never change the font size) way to the vertical ones in
wxStyledTextCtrl.

Closes #15266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-29 12:52:58 +00:00
Robin Dunn
337c5edd43 Use Refresh when the initial paint was abandoned by Scintilla so it will trigger a repaint of the whole window. This is done for things like style changes, word wrapping or brace highlights where more than the current line is affected. Fixes #14653.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-09-30 02:33:56 +00:00
Robin Dunn
9b01abb82d Minimal tweaks and additions to get wxSTC compiling successfully again, with Scintilla 3.21
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-08-14 05:14:46 +00:00
Vadim Zeitlin
14941a1af7 Remove unnecessary Update() in wxStyledTextCtrl scrolling code.
Calling Update() every time ScrollText() dramatically slowed down scrolling
and doesn't seem to be necessary, so remove it.

See #9057.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-29 22:08:24 +00:00
Vadim Zeitlin
23b9814f80 Fix WXK_MENU handling in wxStyledTextCtrl.
Map it to SCK_MENU instead of treating it as a modifier and simply swallowing
it.

Closes #14205.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-15 23:18:05 +00:00
Vadim Zeitlin
81f2b2ee81 Revert the zoom direction on Ctrl-mouse wheel in wxStyledTextCtrl.
The direction of the zoom in wxSTC didn't correspond to the usual conventions
which is to zoom in on Ctrl-Wheel-Up and zoom out on Ctrl-Wheel-Down, while
wxSTC did exactly the converse. Change it to behave as everybody else.

Closes #14031.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-08 13:23:34 +00:00
Robin Dunn
c3e0999b06 Rewrite DoPaint, FullPaint and add FullPaintDC to help deal with flicker problems and to be more like how the other Scintilla ports are working now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-21 05:39:00 +00:00
Vadim Zeitlin
836499118f Ignore WXK_NONE events in wxStyledTextCtrl.
Scintilla use of 0 indicating "modifier key" conflicts with our use of
WXK_NONE indicating absence of a valid key code. As Scintilla can't do
anything with the keys without a key code anyhow, simply ignore them
immediately, without passing them to Scintilla, in DoKeyDown().

This fixes handling of IME input in wxStyledTextCtrl under MSW and possibly
other problems (e.g. with dead char keys).

Closes #13570.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 13:34:16 +00:00
Stefan Csomor
7a68fc9c34 fixes redraw problems under OSX, see #13345
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-20 06:36:06 +00:00
Dimitri Schoolwerth
f32204b0c4 Fixed wxUSE_STD_DEFAULT==0 compilation.
ScintillaWX.cpp didn't compile because std::string is unknown. Include <string> in case the defines that (by default) are set to wxUSE_STD_DEFAULT are 0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-13 11:24:28 +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
Dimitri Schoolwerth
6636ef8ddf Use wxString's empty() when checking if the string is (non-)empty throughout wx.
Instead of constructs such as if "( s.length() )" and "if (s.length() > 0)" use "if ( !s.empty() )" instead. Similarly for "if (s.length() == 0)" or "if ( s.IsNull() )", use "if ( s.empty() )".
No code changes intended except for a few instances where a construct like "if ( s.length() && wxFileExists(s) )" was changed to not check the length of the string and let wxFileExists handle such cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 14:38:36 +00:00
Vadim Zeitlin
35f8d83dbb Fix wxSTC compilation without wxUSE_DRAG_AND_DROP after r65827.
Correct the changes of r65827 to also compile with wxUSE_DRAG_AND_DROP==0
(especially important for the ports without dnd support such as wxX11 and
wxDFB).

Also do the changes in the correct files, i.e. src/stc/stc.{h,cpp}.in and not
in the generated files themselves to prevent them from being overwritten the
next time gen_iface.py is ran.

Finally keep backwards compatibility as SetDragAllowMove(bool) is a public
method so preserve its old semantics and add a new SetDragFlags() instead of
silently breaking the existing code using SetDragAllowMove().

See #11709.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 18:17:30 +00:00
Vadim Zeitlin
676184202d Restore text drag-and-drop in wxSTC broken by Scintilla 2 update.
Drag and drop in wxStyledTextCtrl was broken, apparently since upgrade to
Scintilla 2. Restore it by using the correct wxDrag_XXX constants instead of
boolean values in the code for wxEVT_STC_START_DRAG events generation.

Closes #11709.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-16 18:11:06 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Vadim Zeitlin
c26400bd06 Fix harmless MSVC warning about int to bool conversion in Scintilla.
The warning is harmless but prevents buildbot from reporting any new warnings
during the library compilation step so suppress it.

Notice that it might be better if ViewStyle::extraFontFlag was bool and not
int to begin with.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-07 12:55:21 +00:00
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
Julian Smart
2d512c47df Applied #10799: using CallTipUseStyle() doesn't enable wxSTC_STYLE_CALLTIP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-24 13:17:14 +00:00
Kevin Ollivier
4a3da8c099 Leave anti-aliasing on by default on Mac as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-17 22:53:57 +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
Vadim Zeitlin
d3acc83ae9 fix some (harmless) mingw32 4.3 warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-30 16:30:53 +00:00
Vadim Zeitlin
0c9a798547 fix crash when copying empty selection to clipboard (#4783)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-15 11:45:05 +00:00
Vadim Zeitlin
17e05a8e88 don't interfere with Scintilla drag-and-drop (#9088)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-14 02:21:55 +00:00
Robin Dunn
c0a4c58aca A bit of cleanup for STC's use of PopupWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-27 21:25:03 +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
David Elliott
6420b4c55d Added include wx/timer.h to non WX_PRECOMP case.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-19 17:40:42 +00:00
Václav Slavík
ea88e9bca9 don't export private stc2wx(), wx2stc() functions from wxSTC shared library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-15 08:10:29 +00:00
Vadim Zeitlin
291b0f5b14 fix warnings about parameters shadowing member variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-22 18:22:20 +00:00
Paul Cornett
819850ff06 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-18 17:15:56 +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
e5abfc486b Enable the use of the primary selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-02 21:17:45 +00:00
Vadim Zeitlin
80dc1dd378 compilation fix for Win64 (patch 1690999)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 18:34:07 +00:00
Robin Dunn
67879c5b41 Use float-on-parent frames for the popups if wxPopupWindow is not available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-20 03:26:34 +00:00
Robin Dunn
e64481bf07 Catch WXK_NUMPAD_DELETE and WXK_NUMPAD_INSERT too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-22 21:19:45 +00:00
Robin Dunn
340515d36d Recognize the numpad cursor keys too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-21 16:48:25 +00:00
Robin Dunn
e968f10872 Only do Armel Asselin's memory reduction patch in Paste in the Unicode
build because in the ansi build wxWX2MBbuf is just a char* pointing
into the text wxString's buffer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-29 01:53:18 +00:00
Robin Dunn
134d7051bf Reverted part of rev 1.92. It causes probelms on Windows when
scrolling with the scrollbars since the mouse can be captured nativly
momentarily.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-13 00:18:04 +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
4d02625ccf Changes to ensure that the potential drag is totally cleaned up in LeftButtonUp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-22 21:38:59 +00:00
Robin Dunn
5bd24f7242 Make WXK*PRIOR and WXK*NEXT be aliases for WXK*PAGEUP and WXK*PAGEDOWN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 04:14:29 +00:00
Robin Dunn
5a86739df2 Increase timeout in order to catch slower clicks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 18:09:22 +00:00
Włodzimierz Skiba
f402150f77 wxTinderbox build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 09:56:06 +00:00
Robin Dunn
466c166f5a Fix for bug #1436503. Delay the start of the DnD oprtation in case
the user just intended to click, not drag.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 23:57:45 +00:00
Jamie Gadd
68df211fae Deprecate wxDC::{Begin,End}Drawing()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 11:59:59 +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
Włodzimierz Skiba
c54e5eb0f6 wxOS2/OW warning and build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-23 16:02:51 +00:00
Robin Dunn
443eb93a99 Don't adjust the keycode for Ctrl-Backspace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-13 15:14:00 +00:00
Robin Dunn
382fe64041 Use a wxPopupWindow for the AutoComplete box too.
We don't need to artificially set the clipping region on wxGTK anymore.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-16 01:36:05 +00:00