Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,296 Commits 1 Branch 330 Tags
289532452089421ddadbd4726a8469511a19ab76
Commit Graph

109 Commits

Author SHA1 Message Date
Stefan Csomor
2895324520 merging back XTI branch part 2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-04 08:31:53 +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
Vadim Zeitlin
81ebc04192 Set the window in focus event sent by wxComboCtrl correctly. 
The window parameter wasn't copied correctly in the forwarded event. Fix this
and avoid future problems of the same kind by using the copy ctor for creating
the new event and then override the fields that we need to change from the
original event instead of recreating the new event from bits and pieces of the
original one.

Closes #12741.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-12-03 14:00:31 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace. 
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-30 11:44:45 +00:00
Václav Slavík
dc2b49b3d1 Click on wxOwnerDrawnComboBox's animating popup should close it. 
Previously, it behaved differently from native combo box: clicking the
popup while its opening animation was running had no effect. This was
different from the native control, which would close the popup in this
case (just like when it's fully opened).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-14 18:35:50 +00:00
Jouk Jansen
b9d0da6f6f include correct private.h for wxgtk1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-20 15:38:03 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible. 
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-20 18:18:23 +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
52999871ce In wxComboCtrlBase::DoShowPopup(), if the popup window is a generic TLW or a 'perfect' wxPopupWindow, then try to set focus to the popup control at the end of show 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-06-06 09:35:06 +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
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