Commit Graph

58 Commits

Author SHA1 Message Date
Julian Smart
d1e5be0ec6 Fixed common style collection and superscript/subscript selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-17 17:54:11 +00:00
Vadim Zeitlin
9e50ed28d9 fix wxTextCtrl::operator<<('\n') in Unicode build (should use char overload, not int); corrected mangled documentation of these operators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-28 12:32:32 +00:00
Vadim Zeitlin
1fee6e2577 remove wxTextAttr::CreateFont(); return wxNullFont from GetFont() if we have no font attributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-09 13:14:58 +00:00
Julian Smart
7c3c990ecf Only use fonts in wxTextAttr::Combine if they are really present in the attributes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-07 08:55:12 +00:00
Julian Smart
c40766261b Corrected GetFontAttributes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-26 17:55:19 +00:00
Julian Smart
44cc96a80c Merged wxRichTextAttr and wxTextAttrEx into wxTextAttr, and added a font table
to wxRichTextBuffer to reduce wxFont consumption and increase performance.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-09 11:20:36 +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
c8fe7fda21 fix harmless unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-26 00:39:04 +00:00
Vadim Zeitlin
0ec1179b86 added wxTextEntry common base class for both wxTextCtrl and wxComboBox; refactor wxGTK code to put common parts of these classes in the base class; fixed some inconsistencies in the text control behaviour between platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-26 00:30:22 +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
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
9d11268884 Added wxTextCtrlBase to type info, useful if different text control
implementations are available


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-02 07:41:02 +00:00
Włodzimierz Skiba
d5da0ce7cb Include wx/event.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-27 12:47:14 +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
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
Włodzimierz Skiba
7a893a3152 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 16:22:28 +00:00
Włodzimierz Skiba
15cdc34149 wxStreamToTextRedirector fixes, define wxHAS_TEXT_WINDOW_STREAM.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-13 17:51:16 +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
Václav Slavík
c4d25c01ae fixed wxTextCtrl::EmulateKeyPress to work in Unicode build of wxGTK2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-28 11:19:39 +00:00
Włodzimierz Skiba
1b941f2d31 Warning fixes for OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 05:56:07 +00:00
Włodzimierz Skiba
cb719f2e29 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-23 18:20:56 +00:00
Vadim Zeitlin
692c9b8696 implemented HitTest() for GTK2; test it in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-23 18:07:40 +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
89b674772c subdindented paragraphs support (patch 933436)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-15 18:17:14 +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
64dcc26913 use correct fallback file name in SaveFile() (patch 820884)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 09:05:54 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Václav Slavík
b37023dca3 fix warning on watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-23 14:49:37 +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
Julian Smart
e39af974ef - Moved wxApp::SendIdleEvents and wxApp::ProcessIdle into common code.
- wxWindow::OnInternalIdle is now used in all ports, and ensures that
  user OnIdle events do not interfere with crucial internal processing.
- wxWindow::UpdateWindowUI is now a documented function that
  sends wxUpdateUIEvents, and can be overridden. It has a helper function
  DoUpdateWindowUI for taking appropriate wxUpdateUIEvent action.
- Added functions to wxUpdateUIEvent: Set/GetMode, Set/GetUpdateInterval,
  CanUpdate, to assist with optimising update event frequency.
- Added functions to wxIdleEvent: Set/GetMode, CanSend, to
  determine whether a window should receive idle events.
- Added wxWS_EX_PROCESS_IDLE, wxWS_EX_PROCESS_UI_UPDATES window
  styles for use with conservative idle and update event modes.
- wxMSW and wxGTK now send menu update events only when a menu is
  about to be used.
- Added WM_INITMENU processing instead of WM_ENTERMENULOOP, or
  accelerators don't always get called since menu items may still
  be disabled.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 10:15:21 +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
Mattia Barbon
02a48e3b0a Fix some GCC 3.2 -O2 warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-07 17:32:19 +00:00
Julian Smart
55d99c7a77 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:28:33 +00:00
Vadim Zeitlin
f68c6b523c Unicode compilation fixes after wxFFile change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-02-02 14:17:41 +00:00
Vadim Zeitlin
cd916794f0 made generic EmulateKeyPress() to work with Delete and BackSpace (closes bug 658409)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-02 00:07:13 +00:00
Robert Roebling
401eb3dec2 Lots of Unix/Unicode compile fixes, some of which
are just #ifdef 0 such as the wxExecute calls
    in gdcps.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-05 18:04:08 +00:00
Vadim Zeitlin
94af7d45ef added wxTextCtrl::EmulateKeyPress
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-07 22:29:04 +00:00
Vadim Zeitlin
a5aa80862c added, implemented, documented wxTE_RICH2 and wxTextCtrl::GetRange()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-09 01:32:02 +00:00
Vadim Zeitlin
c598f22518 SetDefaultStyle(wxTextAttr()) now resets the default style instead of not changing it at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-02 13:29:21 +00:00
Vadim Zeitlin
eda40bfc08 superposition of text styles in wxTextCtrl now works as expected (and as documented)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-26 14:50:50 +00:00
Robin Dunn
eef97940e8 GetSelection --> GetStringSelection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-14 03:50:11 +00:00
Vadim Zeitlin
184144794d added wxTextCtrl::GetSelection() returning a wxString - useful for multiline controls under Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-14 01:27:16 +00:00
Vadim Zeitlin
d73e6791fc added wxStreamToTextRedirector
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-19 16:27:15 +00:00
Vadim Zeitlin
d7eee191c5 implemented, tested and documented wxTextCtrl::SetMaxLength()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 12:45:53 +00:00
Vadim Zeitlin
ad0bae85d8 declare and define wxEVT_COMMAND_TEXT_UPDATED even if wxUSE_TEXTCTRL == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 17:56:45 +00:00
Vadim Zeitlin
c57e33394c 1. added wxTE_AUTO_URL style and support for it under Win32 (and brief
mention in docs and tests in the sample)
2. moved wxTextCtrl-specific stuff from defs.h/event.h to textctrl.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 22:40:21 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Julian Smart
9e3cb9eefc Fixed memory leak in textcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-06 11:17:30 +00:00
Vadim Zeitlin
4bc1afd502 added text style support to wxTextCtrl for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-27 03:28:28 +00:00