X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93c5dd39af2fb5eb12c5c837999be944543b21b0..5fe8354960174a56ee21c456ac3ba521a7b9bae5:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 54aea8e647..023caa971e 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -13,10 +13,20 @@ #include "wx/combobox.h" -#include +#if wxUSE_COMBOBOX -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/settings.h" +#include "wx/intl.h" + +#include +#include + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // data @@ -31,11 +41,11 @@ extern bool g_blockEventsOnDrag; static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { - if (!combo->HasVMT()) - return; + if (g_isIdle) wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) - return; + if (!combo->m_hasVMT) return; + + if (g_blockEventsOnDrag) return; if (combo->m_alreadySent) { @@ -49,6 +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 ); } @@ -59,6 +70,10 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) 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() ); event.SetString( combo->GetValue() ); event.SetEventObject( combo ); @@ -86,26 +101,30 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, m_needParent = TRUE; m_acceptsFocus = TRUE; - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxComboBox creation failed") ); + return FALSE; + } m_widget = gtk_combo_new(); // 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 ); + + // and case-sensitive + gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); - wxSize newSize = size; - if (newSize.x == -1) - newSize.x = 100; - if (newSize.y == -1) - newSize.y = 26; - SetSize( newSize.x, newSize.y ); GtkWidget *list = GTK_COMBO(m_widget)->list; for (int i = 0; i < n; i++) { + /* 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 ); @@ -113,18 +132,13 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, gtk_container_add( GTK_CONTAINER(list), list_item ); - gtk_widget_realize( list_item ); - gtk_widget_realize( GTK_BIN(list_item)->child ); + gtk_signal_connect( GTK_OBJECT(list_item), "select", + GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); gtk_widget_show( list_item ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); } - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -132,19 +146,25 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, if (!value.IsNull()) SetValue( value ); - gtk_widget_realize( GTK_COMBO(m_widget)->list ); - gtk_widget_realize( GTK_COMBO(m_widget)->entry ); - gtk_widget_realize( GTK_COMBO(m_widget)->button ); - if (style & wxCB_READONLY) gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE ); gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - SetBackgroundColour( parent->GetBackgroundColour() ); + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if (new_size.y > size_best.y) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); + + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -153,30 +173,38 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, wxComboBox::~wxComboBox() { - wxNode *node = m_clientDataList.First(); + wxNode *node = m_clientObjectList.First(); while (node) { wxClientData *cd = (wxClientData*)node->Data(); if (cd) delete cd; node = node->Next(); } + m_clientObjectList.Clear(); + m_clientDataList.Clear(); } void wxComboBox::AppendCommon( const wxString &item ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() ); + gtk_container_add( GTK_CONTAINER(list), list_item ); + gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); - gtk_container_add( GTK_CONTAINER(list), list_item ); + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_realize( list_item ); + gtk_widget_realize( GTK_BIN(list_item)->child ); - if (m_widgetStyle) ApplyWidgetStyle(); + if (m_widgetStyle) ApplyWidgetStyle(); + } gtk_widget_show( list_item ); } @@ -207,7 +235,7 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData ) void wxComboBox::SetClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return; @@ -217,7 +245,7 @@ void wxComboBox::SetClientData( int n, void* clientData ) void* wxComboBox::GetClientData( int n ) { - wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; @@ -227,7 +255,7 @@ void* wxComboBox::GetClientData( int n ) void wxComboBox::SetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; @@ -240,7 +268,7 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData ) wxClientData* wxComboBox::GetClientObject( int n ) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return (wxClientData*) NULL; @@ -250,7 +278,7 @@ wxClientData* wxComboBox::GetClientObject( int n ) void wxComboBox::Clear() { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; gtk_list_clear_items( GTK_LIST(list), 0, Number() ); @@ -269,7 +297,7 @@ void wxComboBox::Clear() void wxComboBox::Delete( int n ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list ); @@ -277,7 +305,7 @@ void wxComboBox::Delete( int n ) if (!child) { - wxFAIL_MSG(_T("wrong index")); + wxFAIL_MSG(wxT("wrong index")); return; } @@ -302,7 +330,7 @@ void wxComboBox::Delete( int n ) int wxComboBox::FindString( const wxString &item ) { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; @@ -312,7 +340,7 @@ int wxComboBox::FindString( const wxString &item ) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - if (item == label->label) + if (item == wxString(label->label,*wxConvCurrent)) return count; count++; child = child->next; @@ -323,7 +351,7 @@ int wxComboBox::FindString( const wxString &item ) int wxComboBox::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; @@ -340,14 +368,12 @@ int wxComboBox::GetSelection() const } } - wxFAIL_MSG( _T("wxComboBox: no selection") ); - return -1; } wxString wxComboBox::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; @@ -357,11 +383,11 @@ wxString wxComboBox::GetString( int n ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - str = label->label; + str = wxString(label->label,*wxConvCurrent); } else { - wxFAIL_MSG( _T("wxComboBox: wrong index") ); + wxFAIL_MSG( wxT("wxComboBox: wrong index") ); } return str; @@ -369,7 +395,7 @@ wxString wxComboBox::GetString( int n ) const wxString wxComboBox::GetStringSelection() const { - wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; @@ -377,18 +403,18 @@ wxString wxComboBox::GetStringSelection() const if (selection) { GtkBin *bin = GTK_BIN( selection->data ); - wxString tmp = GTK_LABEL( bin->child )->label; + wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent); return tmp; } - wxFAIL_MSG( _T("wxComboBox: no selection") ); + wxFAIL_MSG( wxT("wxComboBox: no selection") ); - return _T(""); + return wxT(""); } int wxComboBox::Number() const { - wxCHECK_MSG( m_widget != NULL, 0, _T("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") ); GtkWidget *list = GTK_COMBO(m_widget)->list; @@ -400,15 +426,19 @@ int wxComboBox::Number() const void wxComboBox::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + + DisableEvents(); GtkWidget *list = GTK_COMBO(m_widget)->list; gtk_list_select_item( GTK_LIST(list), n ); + + EnableEvents(); } void wxComboBox::SetStringSelection( const wxString &string ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); int res = FindString( string ); if (res == -1) return; @@ -418,26 +448,26 @@ void wxComboBox::SetStringSelection( const wxString &string ) wxString wxComboBox::GetValue() const { GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) ); + wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent); return tmp; } void wxComboBox::SetValue( const wxString& value ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = _T(""); + wxString tmp = wxT(""); if (!value.IsNull()) tmp = value; gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() ); } void wxComboBox::Copy() { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if (GTK_MINOR_VERSION > 0) +#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); #else gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 ); @@ -446,10 +476,10 @@ void wxComboBox::Copy() void wxComboBox::Cut() { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if (GTK_MINOR_VERSION > 0) +#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); #else gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 ); @@ -458,10 +488,10 @@ void wxComboBox::Cut() void wxComboBox::Paste() { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if (GTK_MINOR_VERSION > 0) +#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); #else gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 ); @@ -470,7 +500,7 @@ void wxComboBox::Paste() void wxComboBox::SetInsertionPoint( long pos ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_entry_set_position( GTK_ENTRY(entry), (int)pos ); @@ -478,7 +508,7 @@ void wxComboBox::SetInsertionPoint( long pos ) void wxComboBox::SetInsertionPointEnd() { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); SetInsertionPoint( -1 ); } @@ -498,7 +528,7 @@ long wxComboBox::GetLastPosition() const void wxComboBox::Replace( long from, long to, const wxString& value ) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); // FIXME: not quite sure how to do this method right in multibyte mode GtkWidget *entry = GTK_COMBO(m_widget)->entry; @@ -510,7 +540,7 @@ void wxComboBox::Replace( long from, long to, const wxString& value ) void wxComboBox::Remove(long from, long to) { - wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); @@ -551,6 +581,7 @@ void wxComboBox::OnChar( wxKeyEvent &event ) if ( FindString(value) == wxNOT_FOUND ) { Append(value); + SetStringSelection(value); // and generate the selected event for it wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); @@ -566,22 +597,50 @@ void wxComboBox::OnChar( wxKeyEvent &event ) event.Skip(); } +void wxComboBox::DisableEvents() +{ + GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); + GList *child = list->children; + while (child) + { + gtk_signal_disconnect_by_func( GTK_OBJECT(child->data), + GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); + + child = child->next; + } +} + +void wxComboBox::EnableEvents() +{ + GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); + GList *child = list->children; + while (child) + { + gtk_signal_connect( GTK_OBJECT(child->data), "select", + GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); + + child = child->next; + } +} + void wxComboBox::OnSize( wxSizeEvent &event ) { - wxControl::OnSize( event ); + event.Skip(); +#if 0 int w = 21; gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height ); gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y ); gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height ); +#endif // 0 } void wxComboBox::ApplyWidgetStyle() { SetWidgetStyle(); - gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle ); +// gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle ); @@ -609,3 +668,31 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window ) (window == GTK_COMBO(m_widget)->button->window ) ); } +wxSize wxComboBox::DoGetBestSize() const +{ + wxSize ret( wxControl::DoGetBestSize() ); + + // we know better our horizontal extent: it depends on the longest string + // in the combobox + ret.x = 0; + if ( m_widget ) + { + GdkFont *font = m_font.GetInternalFont(); + + wxCoord width; + size_t count = Number(); + for ( size_t n = 0; n < count; n++ ) + { + width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str()); + if ( width > ret.x ) + ret.x = width; + } + } + + // empty combobox should have some reasonable default size too + if ( ret.x < 100 ) + ret.x = 100; + return ret; +} + +#endif