Commit Graph

96 Commits

Author SHA1 Message Date
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
4794626d03 Refactored wxComboPopupExtraEventHandler::OnMouseEvent(). Now block mouse events from the popup control until mouse button has been seen in 'up' state (ignoring first mouse up). This matches Windows native combo box behavior (fixes #12115).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-01 13:46:14 +00:00
Jaakko Salli
eb7117d978 In wxComboPopupExtraEventHandler::OnMouseEvent(): Also include wxEVT_LEFT_UP among the mouse events to be blocked when the cursor is outside the popup area. This fixes wxMSW bug where the popup disappears immediately after mouse button is released (see #12087).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-27 20:03:07 +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
Václav Slavík
174b5c87bc Pass events around with ProcessEvent(), not AddPendingEvent().
The latter adds the event for later processing. As a result, the event
appears to be processed to the caller, even if the handled it was passed
to called Skip() on it. ProcessEvent() doesn't suffer from this problem,
it may modify the event as expected.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:55 +00:00
Václav Slavík
f408451314 Implement native mousewheel behaviour in wxOwnerDrawnComboBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-05 17:18:46 +00:00
Jaakko Salli
bbb8690483 When checking whether the parent has wxTAB_TRAVERSAL style, take into account that the wxComboCtrl can be part of a composite control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-15 17:19:54 +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
2ec335db78 Added wxMSW wxChoice::GetClassDefaultAttributes(), initially used in wxComboCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-21 15:20:37 +00:00
Jaakko Salli
3b9ba64cce Have wxComboCtrl honour any custom foreground and background colour.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-18 17:28:42 +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
fd5b4315dc Changed the ultimate fall-back popup window classes: wxMSW now uses wxFrame, wxMAC uses wxNonOwnedWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-04 19:05:28 +00:00
Vadim Zeitlin
65702d2fe9 Compilation fix for non-MSW: don't use ProcessCommand().
wxControl::ProcessCommand() is MSW-only, use HandleWindowEvent() to fix
compilation under Unix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-26 13:26:03 +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
Julian Smart
126bb30567 Fixed a bug on Mac whereby popup window disappeared as soon as the button was clicked (text control getting focus)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-11 09:30:51 +00:00
Jaakko Salli
4bcf25e994 Various improvements to wxComboCtrl's text ctrl left margin setup: less #defines, better margin when SetCustomPaintWidth() has been called, fixed SetFont() behavior on wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-09 16:41:23 +00:00
Jouk Jansen
48284cc7c4 removed superfluous ;
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-07 13:50:04 +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
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
Jaakko Salli
d42b86211a Under wxGTK, always use wxPopupTransientWindow as the popup window, even if UseAltPopupWindow() has been called. Do this because, of all popup window types, only wxPopupTransientWindow is able to have focused child controls when the popup is shown in wxGTK modal dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-18 16:16:24 +00:00
Jaakko Salli
110d27b332 Have wxComboCtrl respect parent's wxTAB_TRAVERSAL flag; Also cleaned up key event redirecting code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-17 20:52:16 +00:00
Jaakko Salli
df6007a555 Also redirect wxEVT_KEY_UP and wxEVT_CHAR from the embedded wxTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-17 20:19:29 +00:00
Jaakko Salli
0689e4c1f0 Fixed assertion that could appear under wxGTK if wxComboCtrl drop-down button was clicked too quickly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-14 16:42:40 +00:00
Francesco Montorsi
004867dbc5 Change in wxWindow the access specifier of the wxEvtHandler event processing and queuing functions
from public to protected. Adapt wxWidgets code and wxWidgets samples to always use wxWindow::GetEventHandler()
when calling such functions on a wxWindow rather than directly using wxWindow::ProcessEvent, etc.
This enables correct event dispatching to the event handlers which have been pushed (with PushEventHandler) on the 
windows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 11:58:39 +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
Jaakko Salli
7e32a85533 Fixed relaying of wxEVT_MOUSEWHEEL to popup control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-17 13:29:27 +00:00
Robert Roebling
4df230b81e wxComboCtrlBase::Enable() does not refresh the control #9900
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-23 08:19:42 +00:00
Vadim Zeitlin
d050da45f8 make SetValidator() symmetric with GetValidator() (#9793)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-03 11:12:58 +00:00
Václav Slavík
f029f1d15b added wxWindow::HandleAsNavigationKey() helper for handling (not only) TAB key in custom controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-12 20:13:22 +00:00
Robert Roebling
b48eedfc69 use wxPopupWindow for wxCombo (doesn't work yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-09 13:14:06 +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
Paul Cornett
640a91ab0b use logical operator &&, not bitwise &; indentation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-22 04:40:51 +00:00
Vadim Zeitlin
22b6de6a70 more fixes for using wxSocket in console applications (patch 1756260)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-16 14:29:42 +00:00
Robin Dunn
0da1f4c072 Don't use m_popupInterface pointer if it is still NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-16 19:05:47 +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
Vadim Zeitlin
4738d6746b update the value shown in the combobox itself correctly in SetValue() (patch 1669275; bug 1667563)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 23:46:03 +00:00
Julian Smart
a61c912241 Reverted renderer changes and just use window variant within renderer functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-09 14:05:11 +00:00
Julian Smart
f8e1a81f3e Added size constants to allow drawn control parts to match the window variant,
initially on Mac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-08 17:16:24 +00:00
Paul Cornett
46beb2e98d non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-08 07:11:51 +00:00
Vadim Zeitlin
c4b37573a9 fix combobox dropdown position in RTL (patch 1623127)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-07 16:18:55 +00:00
Paul Cornett
d7e15728ea correct access for virtual, declare variable only if used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-07 08:59:19 +00:00
Vadim Zeitlin
f85f5ddf88 fixed unused variable warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-29 00:29:13 +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
Robin Dunn
f3fcecd6ce More layout tweaks for wxComboCtrl on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-26 06:45:45 +00:00
Robin Dunn
c66ed6682a use sizes from the HIG for the best height of the ComboCtrl on wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-25 22:48:47 +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
694f411c85 It's too late.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 18:52:50 +00:00