Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wxEvent::ShouldPropagate() instead of its own propgation control mechanism in wxNavigationKeyEvent (patch 814644)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-30 12:49:56 +00:00
parent 18da7cf292
commit aef35d0ef5
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/event.h
View File

@@ -1731,9 +1731,11 @@ class WXDLLIMPEXP_CORE wxNavigationKeyEvent : public wxEvent
public: public:
wxNavigationKeyEvent() wxNavigationKeyEvent()
: wxEvent(0, wxEVT_NAVIGATION_KEY), : wxEvent(0, wxEVT_NAVIGATION_KEY),
m_flags(IsForward | Propagate), // defaults are for TAB m_flags(IsForward), // defaults are for TAB
m_focus((wxWindow *)NULL) m_focus((wxWindow *)NULL)
{ } {
m_propagationLevel = wxEVENT_PROPAGATE_NONE;
}
wxNavigationKeyEvent(const wxNavigationKeyEvent& event) wxNavigationKeyEvent(const wxNavigationKeyEvent& event)
: wxEvent(event), : wxEvent(event),
@@ -1754,14 +1756,6 @@ public:
void SetWindowChange(bool bIs) void SetWindowChange(bool bIs)
{ if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; } { if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; }
// some navigation events are meant to be propagated upwards (Windows
// convention is to do this for TAB events) while others should always
// cycle inside the panel/radiobox/whatever we're current inside
bool ShouldPropagate() const
{ return (m_flags & Propagate) != 0; }
void SetPropagate(bool bDoIt)
{ if ( bDoIt ) m_flags |= Propagate; else m_flags &= ~Propagate; }
// the child which has the focus currently (may be NULL - use // the child which has the focus currently (may be NULL - use
// wxWindow::FindFocus then) // wxWindow::FindFocus then)
wxWindow* GetCurrentFocus() const { return m_focus; } wxWindow* GetCurrentFocus() const { return m_focus; }
@@ -1773,8 +1767,7 @@ private:
enum enum
{ {
IsForward = 0x0001, IsForward = 0x0001,
WinChange = 0x0002, WinChange = 0x0002
Propagate = 0x0004
}; };
long m_flags; long m_flags;

3
src/common/containr.cpp
View File

@@ -293,6 +293,9 @@ void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
// and instead give it to the first/last child depending from which // and instead give it to the first/last child depending from which
// direction we're coming // direction we're coming
event.SetEventObject(m_winParent); event.SetEventObject(m_winParent);
// disable propagation for this call as otherwise the event might
// bounce back to us.
wxPropagationDisabler disableProp(event);
if ( !child->GetEventHandler()->ProcessEvent(event) ) if ( !child->GetEventHandler()->ProcessEvent(event) )
{ {
// set it first in case SetFocusFromKbd() results in focus // set it first in case SetFocusFromKbd() results in focus