AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,518 Commits 1 Branch 0 Tags 297 MiB
0d4ad161d5
Commit Graph

64 Commits

Author SHA1 Message Date
Paul Cornett
8b4ae731d3 use wxOVERRIDE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2014-03-30 00:02:23 +00:00
Vadim Zeitlin
9b31387508 Merge the changes from 3.0 branch. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-11-12 18:06:37 +00:00
Václav Slavík
5d9b5db01e Make wxComboCtrlBase::Set*groundColour() methods public. 
SetForegroundColour() and SetBackgroundColour() were -- presumably
accidentally -- protected in wxComboCtrlBase, even though they are
documented public virtual methods of wxWindow. This prevented their
use from user code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-27 19:39:37 +00:00
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
e2ac737fba Implement wxComboCtrl::GetSizeFromTextSize(). 
Improve calculation of wxComboCtrl best size which doesn't work correctly for
non-default fonts as shown by r72935. It is still not perfect but better now.

Closes #14825.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-11-14 13:48:23 +00:00
Vadim Zeitlin
30e92ba333 Remove vertical wxTextCtrl adjustment hacks for wxMSW in wxComboCtrl code. 
Because wxTextCtrl used to wrongly report its best size in wxNO_BORDER case
under MSW, wxComboCtrl manually adjusted its position to work around this.
However since r69066 wxTextCtrl::GetBestSize() was fixed and now these
adjustments resulted in wrong vertical position for the control.

Just remove all manual adjustments completely now to fix this.

Closes #13722.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-12-07 14:05:11 +00:00
Dimitri Schoolwerth
d13b34d3f2 No code changes, fixed various typos. 
Applied patch by snowleopard2 fixing typos in interface/. Extended the fixes throughout trunk.

Closes #13076.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-04-03 20:31:32 +00:00
Jaakko Salli
df3c4a42d9 Added wxComboPopup::DestroyPopup(), which responsibility is to call Destroy() for the popup control and also delete the combo popup object itself. The default implementation should be able to handle common cases. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-31 17:22:51 +00:00
Dimitri Schoolwerth
4c51a665c6 Fixed various typos. 
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-22 14:17:38 +00:00
Jaakko Salli
bed867e3f9 Added wxComboCtrlBase::m_hasTcBgCol. Re-using base wxWindow::m_hasBgCol was trouble. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-20 11:15:17 +00:00
Jaakko Salli
10ba26777d Redone (generic) wxComboCtrl background painting and handling. The 'actual' wxWindow background colour is now largely ignored and overridden to refer the text-area's background colour instead (as is usually the case with controls like this). Base 'transparent' background is now only painted when double-buffered rendering is required, and otherwise delegated to the system, as appropriate. This should significantly improve control's appearance and compliancy with GTK+ and OS X themes and custom backgrounds. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-20 10:59:22 +00:00
Jaakko Salli
238b33ab0e Added wxComboPopup::FindItem() to help in deciding how SetValue() should change the value of a read-only wxComboCtrl. This allows wxOwnerDrawnComboBox to have the same behavior as wxComboBox in that respect. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-20 13:51:24 +00:00
Jaakko Salli
ffb9247a85 Add wxComboBox-compatible Popup() and Dismiss() functions in wxComboCtrl 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-17 12:08:55 +00:00
Jaakko Salli
0306e73e63 Make the wxComboCtrl's wxTextEntry interface more complete and consistent. All text is no longer selected on SetValue(), but only when user selects an item from the drop-down list. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-17 11:20:50 +00:00
Jaakko Salli
fda6279358 Instead of having wxComboCtrl mimic wxTextEntry interface, make it actually inherit from the class and implement functions to redirect to the embedded wxTextCtrl. This allows us to simplify the code and get rid of the dirty trick of directing wxComboCtrl's validator to the embedded wxTextCtrl. Also see #12779, which issue 1 is fixed by this change. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-16 17:21:49 +00:00
Jaakko Salli
1ac5cfc7c9 Added wxComboCtrl::SetTextCtrlStyle() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-13 09:59:32 +00:00
Jaakko Salli
db3d75435a In wxComboPopupEvtHandler::OnMouseEvent(), when need to relay event to drop-down button, call HandleButtonMouseEvent() directly, if possible. This is less confusing for the platform-specific wxComboCtrl implementations, and fixes issue where the drop-down button could remain in pressed state after the mouse button was lifted. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-01 15:01:59 +00:00
Jaakko Salli
063155781d For clarity: wxComboPopupExtraEventHandler -> wxComboPopupEvtHandler (there is nothing particularly extra about it) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-01 14:17:32 +00:00
Jaakko Salli
735a300a96 Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7 by marking the drop-down button as 'non-standard' when its size or position is changed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-05-27 14:51:07 +00:00
Václav Slavík
c765e6fb9d Fix text input and completion in wxComboCtrl and wxOwnerDrawnComboBox. 
Both wxEVT_KEY_DOWN and wxEVT_CHAR must be handled and only the latter
used for completion (or any characters input). Don't make incorrect
assumptions about wxEVT_CHAR keycodes either, it's only the Unicode
character and printability that matter.

Otherwise, completion in readonly controls wouldn't work correctly
for e.g. numbers on numpad or non-ASCII characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-04-05 17:19:04 +00:00
Jaakko Salli
107defe36a Added wxComboCtrl::SetHint(), GetHint() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-26 10:33:35 +00:00
Jaakko Salli
5f54075053 Added wxComboCtrlBase::SetFore/BackgroundColour() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-25 09:04:53 +00:00
Jaakko Salli
ddadf560da Some wxComboCtrlBase member functions were enclosed within incorrect compatibility condition 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-11-02 14:57:35 +00:00
Jaakko Salli
a1d5aa9361 Have wxComboCtrl generate wxEVT_COMMAND_COMBOBOX_DROPDOWN and wxEVT_COMMAND_COMBOBOX_CLOSEUP events 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-26 09:15:29 +00:00
Jouk Jansen
c5885966f0 fixed typo : wxDEPRECTED -> wxDEPRECATED 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-07 12:14:21 +00:00
Jaakko Salli
0847e36eff wxTextEntry::SetMargins(), GetMargins() - implemented on wxMSW and wxGTK (GTK+ 2.10+); also added similar functions into wxComboCtrl, deprecated old indent-functions; wxPropertyGrid modified to use the new functionality 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-05 12:39:12 +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
Jaakko Salli
8c61a9ea94 Added wxComboPopup::GetComboCtrl() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-22 15:13:29 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Robert Roebling
e569b49372 [ 1945434 ] Changing method wxComboCtrlBase::DrawButton to virtual one 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-04-21 18:48:03 +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
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Vadim Zeitlin
c475be6dfa make PositionTextCtrl() virtual (patch 1734405) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-06-10 16:32:06 +00:00
Václav Slavík
47b378bd88 removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-14 09:58:37 +00:00
Vadim Zeitlin
c905c0d60f miscellaneous LnF improvements, including support for Vista-style (patch 1588794) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-10 18:06:11 +00:00
Robin Dunn
2dfa37d69e Make room for the focus ring to be visible on Mac. 
wxMac fix for resetting the focus to the textctrl when the combo ctrl gets it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-28 23:11:21 +00:00
Vadim Zeitlin
670048b2f0 set/get validator for wxTextCtrl part of wxComboCtrl and not the combo itself (patch 1599214, closes bug 1598600) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-19 14:44:30 +00:00
Vadim Zeitlin
373d466f85 changed last DrawButton() parameter from bool to int to allow for future extensions (patch 1595264) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-12 23:34:11 +00:00
Robert Roebling
4427c0a3ff [ 1585858 ] Fix wxDatePickerCtrlGeneric and wxComboCtrl kb navigation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-27 18:02:21 +00:00
Robert Roebling
30be036c6d Make animation of combo-popdown optional. 
Replace wxMiniSleep() + wxYield() implemenation
    by wxTimer based one.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-26 20:35:57 +00:00
Robert Roebling
974a12f86a [ 1584680 ] wxComboCtrl Popup Animation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-25 19:48:46 +00:00
Vadim Zeitlin
06077aaf2c add alt popup window style allowing to use keyboard and comboboxes in the popup window and use it for the generic date picker (patch 1582391 from Jaakko) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-22 20:25:08 +00:00
Vadim Zeitlin
2e992e06a7 added wxWindow::IsDoubleBuffered() and improve wxBufferedDC (patch 1565330) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-09 16:39:34 +00:00
Robert Roebling
1efad474fd [ 1572220 ] Show popup when wxComboCtrl image area clicked 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 15:59:53 +00:00
Robert Roebling
ce9685190e [ 1560860 ] wxComboCtrl EVT_TEXT filtering. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-23 09:04:25 +00:00
Robert Roebling
b104d1f017 [ 1557326 ] Remove redundant code from wxComboCtrl 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-17 11:03:15 +00:00
Robert Roebling
118f5fbd06 Commit wxComboCtrl clipping patch from J. Salli 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-03 13:21:29 +00:00
Vadim Zeitlin
b445b6a76e better key handling for MSW and GTK (patch 1526666) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-13 00:35:02 +00:00
Vadim Zeitlin
ef43e62e77 reverted the move of wxComboBox styles from wx/defs.h to wx/combobox.h, a lot of existing code (including wxChoice implementation inside wx itself) uses these styles without including wx/combobox.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-30 20:04:10 +00:00
Robert Roebling
79f9018c70 Compilation fix after wxCB_ flags move. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-30 12:49:37 +00:00