AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied John's patch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2003-02-18 09:48:55 +00:00
parent 2cdd094b12
commit 0878fb4c7d
2 changed files with 42 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/gtk/combobox.cpp
View File

@ -63,6 +63,8 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
GtkWidget *list = GTK_COMBO(combo->m_widget)->list; GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection ); gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
} }
else if ((curSelection >= 0) && (combo->GetString(curSelection) == combo->GetValue()))
return;
combo->m_prevSelection = curSelection; combo->m_prevSelection = curSelection;
@ -85,6 +87,13 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
if (!combo->m_hasVMT) return; if (!combo->m_hasVMT) return;
// avoids double events when the GetValue = one of the selections
if (combo->m_alreadySent)
{
combo->m_alreadySent = FALSE;
return;
}
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() ); event.SetString( combo->GetValue() );
event.SetEventObject( combo ); event.SetEventObject( combo );
@ -128,7 +137,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
// and case-sensitive // and case-sensitive
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
#ifndef __WXGTK20__ #ifndef __WXGTK20__
@ -617,54 +625,28 @@ void wxComboBox::OnChar( wxKeyEvent &event )
if ( event.GetKeyCode() == WXK_RETURN ) if ( event.GetKeyCode() == WXK_RETURN )
{ {
wxString value = GetValue(); wxString value = GetValue();
int selection = GetSelection();
if ( Number() == 0 ) // note that gtk automatically selects an item if its in the list
// so you don't have to call FindString
if ((selection >= 0) && (GetString(selection) == value))
{ {
// make Enter generate "selected" event if there is only one item // make Enter generate "selected" event if it equals an item
// in the combobox - without it, it's impossible to select it at
// all!
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetInt( 0 ); event.SetInt( selection );
event.SetString( value ); event.SetString( value );
event.SetEventObject( this ); event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event ); GetEventHandler()->ProcessEvent( event );
} }
else else
{ {
// add the item to the list if it's not there yet wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
if ( FindString(value) == wxNOT_FOUND ) event.SetString(value);
{ event.SetInt(selection);
Append(value); event.SetEventObject( this );
SetStringSelection(value); GetEventHandler()->ProcessEvent( event );
// and generate the selected event for it
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetInt( Number() - 1 );
event.SetString( value );
event.SetEventObject( this );
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);
return;
}
}
return;
} }
return;
} }
event.Skip(); event.Skip();

60
src/gtk1/combobox.cpp
View File

@ -63,6 +63,8 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
GtkWidget *list = GTK_COMBO(combo->m_widget)->list; GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection ); gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
} }
else if ((curSelection >= 0) && (combo->GetString(curSelection) == combo->GetValue()))
return;
combo->m_prevSelection = curSelection; combo->m_prevSelection = curSelection;
@ -85,6 +87,13 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
if (!combo->m_hasVMT) return; if (!combo->m_hasVMT) return;
// avoids double events when the GetValue = one of the selections
if (combo->m_alreadySent)
{
combo->m_alreadySent = FALSE;
return;
}
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() ); event.SetString( combo->GetValue() );
event.SetEventObject( combo ); event.SetEventObject( combo );
@ -128,7 +137,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
// and case-sensitive // and case-sensitive
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
#ifndef __WXGTK20__ #ifndef __WXGTK20__
@ -617,54 +625,28 @@ void wxComboBox::OnChar( wxKeyEvent &event )
if ( event.GetKeyCode() == WXK_RETURN ) if ( event.GetKeyCode() == WXK_RETURN )
{ {
wxString value = GetValue(); wxString value = GetValue();
int selection = GetSelection();
if ( Number() == 0 ) // note that gtk automatically selects an item if its in the list
// so you don't have to call FindString
if ((selection >= 0) && (GetString(selection) == value))
{ {
// make Enter generate "selected" event if there is only one item // make Enter generate "selected" event if it equals an item
// in the combobox - without it, it's impossible to select it at
// all!
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetInt( 0 ); event.SetInt( selection );
event.SetString( value ); event.SetString( value );
event.SetEventObject( this ); event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event ); GetEventHandler()->ProcessEvent( event );
} }
else else
{ {
// add the item to the list if it's not there yet wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
if ( FindString(value) == wxNOT_FOUND ) event.SetString(value);
{ event.SetInt(selection);
Append(value); event.SetEventObject( this );
SetStringSelection(value); GetEventHandler()->ProcessEvent( event );
// and generate the selected event for it
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetInt( Number() - 1 );
event.SetString( value );
event.SetEventObject( this );
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);
return;
}
}
return;
} }
return;
} }
event.Skip(); event.Skip();