cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,022 Commits 1 Branch 0 Tags 333 MiB
7822ffb1de
Commit Graph

92 Commits

Author SHA1 Message Date
Vadim Zeitlin
a8abba41bc No changes, just refactor wxTextCtrl::SetStyle() in wxMSW. 
Split this overly long function into MSWSetCharFormat() and MSWSetParaFormat().

No real changes otherwise except for the use of PARAFORMAT instead of
PARAFORMAT2 if wxUSE_RICHEDIT2 is not set as it was certainly intended (but
the fact that nobody complained about this problem means that nobody must be
compiling without wxUSE_RICHEDIT2 by now so arguably we should just remove it
completely).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-18 16:26:30 +00:00
Vadim Zeitlin
4f7c00f237 Set wxTextCtrl::m_verRichEdit to 4 for RichEdit 4.1. 
Set m_verRichEdit to a different value for the version 4.1 of the control as
it behaves subtly differently from the previous versions.

Also clarify that value of 2 is used for both 2.0 and 3.0 versions of the
control.

No real changes yet.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-18 16:26:22 +00:00
Vadim Zeitlin
81fb185e4f Fix setting the fonts for wxMSW wxTextCtrl with wxTE_RICH(2) style. 
Using WM_SETFONT seemed to work with rich edit controls but in fact it
doesn't, it only changes the font used by the control initially apparently but
it can be reset later.

Use EM_SETCHARFORMAT which is more reliable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-05-25 21:15:24 +00:00
Vadim Zeitlin
b7421ab625 Move wxMSW wxTextCtrl::GetDefaultAttributes() to wxTextCtrlBase. 
This commit doesn't introduce any changes in the control behaviour, it simply
moves the existing method to the base class because it is not MSW-specific.

Also implement wxTextCtrlBase::GetClassDefaultAttributes() because if a class
implements GetDefaultAttributes() it should implement it as well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-07 05:01:14 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space. 
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-21 10:41:26 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-26 15:06:00 +00:00
Václav Slavík
e2cf30aa1c wxMSW: generate wxClipboardTextEvent from wxTextCtrl with wxTE_RICH style too 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-15 12:28:03 +00:00
Paul Cornett
3c75d8baf9 make access for virtuals match base 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-26 06:20:23 +00:00
Vadim Zeitlin
944287e68e don't declare HasSelection() in this class and especially don't declare it as protected 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-27 12:47:12 +00:00
Vadim Zeitlin
fa2f57be4d refactor wxMSW code to extract parts common to wxTextCtrl and wxComboBox into wxTextEntry 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-26 16:48:46 +00:00
Vadim Zeitlin
20a0e99964 get rid of the built-in drop target in rich text controls before setting the user-defined one as otherwise it fails 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-15 01:09:01 +00:00
Julian Smart
a047aff270 Added wxBORDER_THEME, wxWindow::GetDefaultBorderForControl(), wxWindow::CanApplyThemeBorder(). 
wxTextCtrl and wxSearchCtrl now get the correct border on wxMSW, and the wxRichTextCtrl sample
also now demonstrates correct borders.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-08-07 19:22:43 +00:00
Julian Smart
715ce94da9 IsRich should be defined even if wxUSE_RICHTEXT isn't 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-01-09 21:26:53 +00:00
Vadim Zeitlin
9b99c1e36a changing ES_LEFT/CENTER/RIGHT styles only works for plain (not rich) controls and only under XP, recreate the control in SetWindowStyleFlag() if it's a richedit one or if the system is earlier than XP 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-20 13:38:25 +00:00
Vadim Zeitlin
dd1c16314e restored sending events from Replace/Remove/Write/AppendText() methods 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 23:16:53 +00:00
Vadim Zeitlin
ee2ec18e88 moved DoSetValue() to wxTextCtrlBase instead of having it in almost, but not quite all, derived classes; linking fixes for wxCocoa/wxX11/wxMotif 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 22:40:14 +00:00
Vadim Zeitlin
28fdd8db44 added wxTextCtrl::IsEmpty() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 17:52:39 +00:00
Vadim Zeitlin
f6519b40fe added wxTextCtrl::ChangeValue() which is the same as SetValue() but doesn't send the text changed event (first part of patch 1553551) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 17:46:12 +00:00
Julian Smart
3306aec124 Added DoLoadFile, DoSaveFile to wxTextCtrlBase 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-24 11:40:33 +00:00
Julian Smart
3966a9f4f8 Better compatibility between wxRichTextCtrl and wxTextCtrlBase 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-19 17:06:54 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-05 20:47:48 +00:00
Vadim Zeitlin
6f02a879ed make access specifiers for the virtual functions match their access in the base class (patch 1400131) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-08 21:47:09 +00:00
Julian Smart
8ef51d6704 Attempt at using inkedit control for wxTextCtrl, when PC is tablet enabled. Currently 
doesn't behave properly but is a first step.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-06 17:56:44 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-23 12:56:45 +00:00
Vadim Zeitlin
4fa8085100 decreased text limit which we consider to be set by user (and not built in the control) to 10001 which is less than default 30000 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-29 23:01:56 +00:00
Vadim Zeitlin
2bae4332e7 extended wxWindow::MSWGetBgBrush() and wxControl::MSWControlColor() to work for arbitrary HWNDs and not just wxWindows: this allows us to draw proper background for slider labels and other subcontrols 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-10 21:55:12 +00:00
Vadim Zeitlin
26f60eb6a4 don't steal EVT_RIGHT_UP in rich edit controls for context menu (patch 1143823) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-19 17:27:30 +00:00
Vadim Zeitlin
88e04461ee removed m_isCaretAtEnd optimization added in rev 1.232 as we don't always detect when the carets position changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-15 14:02:25 +00:00
Włodzimierz Skiba
7d8268a1d6 wxTextPos for all GetLastPosition with constants for special cases. Make it virtual everywhere. Avoid doubling typedefs. Always include textctrl.h for combobox.h. Source cleaning. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-19 16:25:34 +00:00
Vadim Zeitlin
2c62dd25cd changed the code to be really sure that exactly one update event is sent when SetValue() is called 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-25 14:43:54 +00:00
Vadim Zeitlin
48fa6bd38a replaced OnCtlColor(7 params) with MSWControlColor(1 param) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-19 19:40:31 +00:00
Vadim Zeitlin
bcb251a0c1 small optimization for wxTextCtrl (forgot to commit with textctrl.cpp) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-16 12:06:02 +00:00
Ryan Norton
52f2f7b2c1 fix for [ 1052989 ] TextCtrl.SetBackgroundColour(wx.NullColour) bug 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-07 14:14:10 +00:00
Włodzimierz Skiba
bfbb0b4c77 Source cleaning: -1/wxID_ANY/wxDefaultCoord, ::, TRUE/true. FALSE/false, tabs, whitespaces. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-07 06:01:01 +00:00
Vadim Zeitlin
3b830ce00d unhide the other HitTest() overload 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-23 20:52:22 +00:00
Vadim Zeitlin
6726a6b097 implement HitTest(pos) variant and not HitTest(x, y) one as this is what Windows gives us 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-23 18:43:32 +00:00
Julian Smart
655719367a Use old licence name 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-23 14:56:36 +00:00
Vadim Zeitlin
3a5bcc4db0 removed Win16 code (patch 905241), last version with remains of Win16 support tagged with BEFORE_WIN16_REMOVAL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-28 13:10:14 +00:00
Julian Smart
c140b7e7c9 Applied patch [ 903619 ] Win64 and Itanium support 
by Brian Palmer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-25 10:45:02 +00:00
Vadim Zeitlin
efe66bbc0e added wxTextCtrl::HitTest(); implemented it for MSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-04 14:56:14 +00:00
Vadim Zeitlin
3a9fa0d6b5 added wxTextCtrl::MarkDirty() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-23 00:09:18 +00:00
Vadim Zeitlin
7411f983f1 wxTextCtrl::GetValue() lost (replaced with question marks) all characters not in the current encoding -- but now it shouldn't 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-19 22:21:48 +00:00
Václav Slavík
1202890513 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:38:21 +00:00
Vadim Zeitlin
fc7a2a602b undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-22 00:24:07 +00:00
Vadim Zeitlin
e3a6a6b2bc added Show/HideNativeCaret() (patch 759924) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-19 19:01:27 +00:00
Julian Smart
e00a5d3ca1 Extended wxTextAttr and added wxTextCtrl::GetStyle stub 
allow better rich text support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-06-20 16:25:31 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-12-04 14:11:26 +00:00
Vadim Zeitlin
5036ea9074 send event from Clear() for a simple text control, send only one event from SetValue() instead of 2 for a rich one 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-22 18:02:16 +00:00
Vadim Zeitlin
5bf75ae769 default style now applies to the text entered by the user as well (patch 574789) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-07-21 18:49:10 +00:00