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

use native TAB traversal for GTK+ 2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-26 19:30:20 +00:00
parent 5486c1a283
commit 28e88942bc
27 changed files with 36 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/gtk/window.cpp
View File

@@ -1114,30 +1114,6 @@ gtk_window_key_press_callback( GtkWidget *widget,
}
}
// win is a control: tab can be propagated up
if ( !ret &&
((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here - the control may
// have this style, yet choose not to process this particular TAB in which
// case TAB must still work as a navigational character
// JS: enabling again to make consistent with other platforms
// (with wxTE_PROCESS_TAB you have to call Navigate to get default
// navigation behaviour)
#if wxUSE_TEXTCTRL
(! (win->HasFlag(wxTE_PROCESS_TAB) && win->IsKindOf(CLASSINFO(wxTextCtrl)) )) &&
#endif
win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
{
wxNavigationKeyEvent new_event;
new_event.SetEventObject( win->GetParent() );
// GDK reports GDK_ISO_Left_Tab for SHIFT-TAB
new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
// CTRL-TAB changes the (parent) window, i.e. switch notebook page
new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
new_event.SetCurrentFocus( win );
ret = win->GetParent()->GetEventHandler()->ProcessEvent( new_event );
}
return ret;
}
}
@@ -1928,6 +1904,25 @@ gtk_window_focus_out_callback( GtkWidget *widget,
return FALSE;
}
static gboolean
wx_window_focus_callback(GtkWidget *widget,
GtkDirectionType direction,
wxWindowGTK *win)
{
// the default handler for focus signal in GtkPizza (or, rather, in
// GtkScrolledWindow from which GtkPizza inherits this behaviour) sets
// focus to the window itself even if it doesn't accept focus, i.e. has no
// GTK_CAN_FOCUS in its style -- work around this by forcibly preventing
// the signal from reaching gtk_scrolled_window_focus() if we don't have
// any children which might accept focus (we know we don't accept the focus
// ourselves as this signal is only connected in this case)
if ( win->GetChildren().empty() )
g_signal_stop_emission_by_name(widget, "focus");
// we didn't change the focus
return FALSE;
}
//-----------------------------------------------------------------------------
// "enter_notify_event"
//-----------------------------------------------------------------------------
@@ -2283,7 +2278,6 @@ void wxWindowGTK::Init()
m_insertCallback = (wxInsertChildFunction) NULL;
m_acceptsFocus = false;
m_hasFocus = false;
m_clipPaintRegion = false;
@@ -2330,7 +2324,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
m_insertCallback = wxInsertChildInWindow;
m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
@@ -2365,9 +2358,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
m_acceptsFocus = true;
// connect various scroll-related events
for ( int dir = 0; dir < ScrollDir_Max; dir++ )
{
@@ -2516,6 +2506,16 @@ void wxWindowGTK::PostCreation()
}
}
if ( !AcceptsFocusFromKeyboard() )
{
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
if ( m_wxwindow )
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
g_signal_connect(m_widget, "focus",
G_CALLBACK(wx_window_focus_callback), this);
}
// connect to the various key and mouse handlers
GtkWidget *connect_widget = GetConnectWidget();
@@ -3218,11 +3218,6 @@ void wxWindowGTK::SetFocus()
}
}
bool wxWindowGTK::AcceptsFocus() const
{
return m_acceptsFocus && wxWindowBase::AcceptsFocus();
}
bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
{
wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );