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

Small fix for tabbing into wxListBox.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-09-22 20:57:09 +00:00
parent a76fd371f7
commit eccd56020f
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/window.cpp
View File

@@ -73,11 +73,6 @@
#include <pango/pangox.h> #include <pango/pangox.h>
#endif #endif
#ifdef __WXGTK20__
#define SET_CONTAINER_FOCUS(w, d) gtk_widget_child_focus((w), (d))
#else
#define SET_CONTAINER_FOCUS(w, d) gtk_container_focus(GTK_CONTAINER(w), (d))
#endif
#ifdef __WXGTK20__ #ifdef __WXGTK20__
#ifdef HAVE_XIM #ifdef HAVE_XIM
@@ -3626,8 +3621,16 @@ void wxWindowGTK::SetFocus()
} }
else if (m_widget) else if (m_widget)
{ {
#ifdef __WXGTK20__
if (GTK_IS_CONTAINER(m_widget))
{
gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD );
}
else
#endif
if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) ) if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
{ {
if (!GTK_WIDGET_REALIZED(m_widget)) if (!GTK_WIDGET_REALIZED(m_widget))
{ {
// we can't set the focus to the widget now so we remember that // we can't set the focus to the widget now so we remember that
@@ -3648,11 +3651,14 @@ void wxWindowGTK::SetFocus()
gtk_widget_grab_focus (m_widget); gtk_widget_grab_focus (m_widget);
} }
} }
else if (GTK_IS_CONTAINER(m_widget)) else
#ifndef __WXGTK20__
if (GTK_IS_CONTAINER(m_widget))
{ {
SET_CONTAINER_FOCUS( m_widget, GTK_DIR_TAB_FORWARD ); gtk_container_focus( GTK_CONTAINER(w), GTK_DIR_TAB_FORWARD );
} }
else else
#endif
{ {
wxLogTrace(TRACE_FOCUS, wxLogTrace(TRACE_FOCUS,
_T("Can't set focus to %s(%s)"), _T("Can't set focus to %s(%s)"),

20
src/gtk1/window.cpp
View File

@@ -73,11 +73,6 @@
#include <pango/pangox.h> #include <pango/pangox.h>
#endif #endif
#ifdef __WXGTK20__
#define SET_CONTAINER_FOCUS(w, d) gtk_widget_child_focus((w), (d))
#else
#define SET_CONTAINER_FOCUS(w, d) gtk_container_focus(GTK_CONTAINER(w), (d))
#endif
#ifdef __WXGTK20__ #ifdef __WXGTK20__
#ifdef HAVE_XIM #ifdef HAVE_XIM
@@ -3626,8 +3621,16 @@ void wxWindowGTK::SetFocus()
} }
else if (m_widget) else if (m_widget)
{ {
#ifdef __WXGTK20__
if (GTK_IS_CONTAINER(m_widget))
{
gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD );
}
else
#endif
if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) ) if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
{ {
if (!GTK_WIDGET_REALIZED(m_widget)) if (!GTK_WIDGET_REALIZED(m_widget))
{ {
// we can't set the focus to the widget now so we remember that // we can't set the focus to the widget now so we remember that
@@ -3648,11 +3651,14 @@ void wxWindowGTK::SetFocus()
gtk_widget_grab_focus (m_widget); gtk_widget_grab_focus (m_widget);
} }
} }
else if (GTK_IS_CONTAINER(m_widget)) else
#ifndef __WXGTK20__
if (GTK_IS_CONTAINER(m_widget))
{ {
SET_CONTAINER_FOCUS( m_widget, GTK_DIR_TAB_FORWARD ); gtk_container_focus( GTK_CONTAINER(w), GTK_DIR_TAB_FORWARD );
} }
else else
#endif
{ {
wxLogTrace(TRACE_FOCUS, wxLogTrace(TRACE_FOCUS,
_T("Can't set focus to %s(%s)"), _T("Can't set focus to %s(%s)"),