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

Do dialog's default action (mostly "OK") if

Browse Source 
ENTER was hit in a combobox and the
    TEXT_ENTER event was not handled. MSW
    seems to be doing something similar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-03-02 11:07:45 +00:00
parent 5b6f98d439
commit f11270d478
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/combobox.cpp
View File

@@ -629,7 +629,24 @@ void wxComboBox::OnChar( wxKeyEvent &event )
event.SetString( GetValue() );
event.SetInt( GetSelection() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
if (!GetEventHandler()->ProcessEvent( event ))
{
// This will invoke the dialog default action, such
// as the clicking the default button.
wxWindow *top_frame = m_parent;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
{
GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
if (window->default_widget)
gtk_widget_activate (window->default_widget);
}
}
// Catch GTK event so that GTK doesn't open the drop
// down list upon RETURN.

19
src/gtk1/combobox.cpp
View File

@@ -629,7 +629,24 @@ void wxComboBox::OnChar( wxKeyEvent &event )
event.SetString( GetValue() );
event.SetInt( GetSelection() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
if (!GetEventHandler()->ProcessEvent( event ))
{
// This will invoke the dialog default action, such
// as the clicking the default button.
wxWindow *top_frame = m_parent;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
{
GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
if (window->default_widget)
gtk_widget_activate (window->default_widget);
}
}
// Catch GTK event so that GTK doesn't open the drop
// down list upon RETURN.