1. more wxMotif fixes
2. wxGetNumberFromUser added 3. more compilation fixes when compiling without sockets git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,7 +59,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
|
||||
event.SetInt( combo->GetSelection() );
|
||||
event.SetString( combo->GetStringSelection() );
|
||||
event.SetEventObject( combo );
|
||||
|
||||
|
||||
combo->GetEventHandler()->ProcessEvent( event );
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ static void
|
||||
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
|
||||
{
|
||||
if (g_isIdle) wxapp_install_idle_handler();
|
||||
|
||||
|
||||
if (!combo->m_hasVMT) return;
|
||||
|
||||
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
|
||||
@@ -126,7 +126,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
/* don't send first event, which GTK sends aways when
|
||||
inserting the first item */
|
||||
m_alreadySent = TRUE;
|
||||
|
||||
|
||||
GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
|
||||
|
||||
m_clientDataList.Append( (wxObject*)NULL );
|
||||
@@ -360,8 +360,6 @@ int wxComboBox::GetSelection() const
|
||||
}
|
||||
}
|
||||
|
||||
wxFAIL_MSG( _T("wxComboBox: no selection") );
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -596,7 +594,7 @@ void wxComboBox::DisableEvents()
|
||||
GList *child = list->children;
|
||||
while (child)
|
||||
{
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
|
||||
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
|
||||
|
||||
child = child->next;
|
||||
@@ -619,7 +617,7 @@ void wxComboBox::EnableEvents()
|
||||
void wxComboBox::OnSize( wxSizeEvent &event )
|
||||
{
|
||||
event.Skip();
|
||||
|
||||
|
||||
return;
|
||||
|
||||
int w = 21;
|
||||
|
Reference in New Issue
Block a user