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

Hah!

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-02-28 09:21:54 +00:00
parent cdc34da45b
commit e7f94796de
2 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/gtk/combobox.cpp
View File

@@ -35,9 +35,6 @@ extern bool g_isIdle;
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
static wxComboBox *gs_lastCombo = NULL;
static wxString gs_lastString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "select-child" - click/cursor get select-child, changed, select-child // "select-child" - click/cursor get select-child, changed, select-child
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -60,17 +57,6 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
} }
combo->m_prevSelection = curSelection; combo->m_prevSelection = curSelection;
if ((combo == gs_lastCombo) &&
(combo->GetStringSelection() == gs_lastString))
{
return;
}
else
{
gs_lastCombo = combo;
gs_lastString = combo->GetStringSelection();
}
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
event.SetInt( curSelection ); event.SetInt( curSelection );
event.SetString( combo->GetStringSelection() ); event.SetString( combo->GetStringSelection() );
@@ -97,6 +83,12 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
combo->GetEventHandler()->ProcessEvent( event ); combo->GetEventHandler()->ProcessEvent( event );
} }
static void
gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
{
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxComboBox // wxComboBox
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -127,6 +119,13 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
} }
m_widget = gtk_combo_new(); m_widget = gtk_combo_new();
GtkCombo *combo = GTK_COMBO(m_widget);
// Disable GTK's broken events ...
gtk_signal_disconnect( combo->entry, GTK_COMBO(m_widget)->entry_change_id );
// ... and add surogate handler.
combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
(GtkSignalFunc) gtk_dummy_callback, combo);
// make it more useable // make it more useable
gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
@@ -154,23 +153,23 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
m_focusWidget = GTK_COMBO(m_widget)->entry; m_focusWidget = combo->entry;
PostCreation(); PostCreation();
ConnectWidget( GTK_COMBO(m_widget)->button ); ConnectWidget( combo->button );
// MSW's combo box shows the value and the selection is -1 // MSW's combo box shows the value and the selection is -1
GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_entry_set_text( GTK_ENTRY(combo->entry), wxGTK_CONV(value) );
gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV(value) ); gtk_list_unselect_all( GTK_LIST(combo->list) );
if (style & wxCB_READONLY) if (style & wxCB_READONLY)
gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE ); gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
wxSize size_best( DoGetBestSize() ); wxSize size_best( DoGetBestSize() );
@@ -391,8 +390,6 @@ int wxComboBox::FindString( const wxString &item )
#else #else
wxString str( label->label ); wxString str( label->label );
#endif #endif
wxPrintf( L"Item %s\n", str.c_str() );
if (item == str) if (item == str)
return count; return count;
@@ -648,12 +645,16 @@ void wxComboBox::DisableEvents()
{ {
gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list), gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list),
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->entry),
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
} }
void wxComboBox::EnableEvents() void wxComboBox::EnableEvents()
{ {
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
} }
void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::OnSize( wxSizeEvent &event )

47
src/gtk1/combobox.cpp
View File

@@ -35,9 +35,6 @@ extern bool g_isIdle;
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
static wxComboBox *gs_lastCombo = NULL;
static wxString gs_lastString;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "select-child" - click/cursor get select-child, changed, select-child // "select-child" - click/cursor get select-child, changed, select-child
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -60,17 +57,6 @@ gtk_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(wi
} }
combo->m_prevSelection = curSelection; combo->m_prevSelection = curSelection;
if ((combo == gs_lastCombo) &&
(combo->GetStringSelection() == gs_lastString))
{
return;
}
else
{
gs_lastCombo = combo;
gs_lastString = combo->GetStringSelection();
}
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
event.SetInt( curSelection ); event.SetInt( curSelection );
event.SetString( combo->GetStringSelection() ); event.SetString( combo->GetStringSelection() );
@@ -97,6 +83,12 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
combo->GetEventHandler()->ProcessEvent( event ); combo->GetEventHandler()->ProcessEvent( event );
} }
static void
gtk_dummy_callback(GtkEntry *WXUNUSED(entry), GtkCombo *WXUNUSED(combo))
{
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxComboBox // wxComboBox
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -127,6 +119,13 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
} }
m_widget = gtk_combo_new(); m_widget = gtk_combo_new();
GtkCombo *combo = GTK_COMBO(m_widget);
// Disable GTK's broken events ...
gtk_signal_disconnect( combo->entry, GTK_COMBO(m_widget)->entry_change_id );
// ... and add surogate handler.
combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
(GtkSignalFunc) gtk_dummy_callback, combo);
// make it more useable // make it more useable
gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
@@ -154,23 +153,23 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
m_focusWidget = GTK_COMBO(m_widget)->entry; m_focusWidget = combo->entry;
PostCreation(); PostCreation();
ConnectWidget( GTK_COMBO(m_widget)->button ); ConnectWidget( combo->button );
// MSW's combo box shows the value and the selection is -1 // MSW's combo box shows the value and the selection is -1
GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_entry_set_text( GTK_ENTRY(combo->entry), wxGTK_CONV(value) );
gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV(value) ); gtk_list_unselect_all( GTK_LIST(combo->list) );
if (style & wxCB_READONLY) if (style & wxCB_READONLY)
gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE ); gtk_entry_set_editable( GTK_ENTRY( combo->entry ), FALSE );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", gtk_signal_connect( GTK_OBJECT(combo->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
wxSize size_best( DoGetBestSize() ); wxSize size_best( DoGetBestSize() );
@@ -391,8 +390,6 @@ int wxComboBox::FindString( const wxString &item )
#else #else
wxString str( label->label ); wxString str( label->label );
#endif #endif
wxPrintf( L"Item %s\n", str.c_str() );
if (item == str) if (item == str)
return count; return count;
@@ -648,12 +645,16 @@ void wxComboBox::DisableEvents()
{ {
gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list), gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->list),
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
gtk_signal_disconnect_by_func( GTK_OBJECT(GTK_COMBO(m_widget)->entry),
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
} }
void wxComboBox::EnableEvents() void wxComboBox::EnableEvents()
{ {
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child", gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->list), "select-child",
GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this );
} }
void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::OnSize( wxSizeEvent &event )