X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06cfab17389f4bbd38560dd86ee39931e979bb1e..b53e38fed51f88117e571676b3d12d7da86310f0:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 45cf031ba1..c138c48a42 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -4,22 +4,31 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "combobox.h" #endif - #include "wx/combobox.h" #if wxUSE_COMBOBOX -#include +#include "wx/settings.h" +#include "wx/intl.h" + +#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED + +#include +#include + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- -#include "gdk/gdk.h" -#include "gtk/gtk.h" +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // data @@ -31,11 +40,15 @@ extern bool g_blockEventsOnDrag; // "select" //----------------------------------------------------------------------------- -static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) +static void +gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo ) { - if (!combo->HasVMT()) return; + if (g_isIdle) wxapp_install_idle_handler(); + + if (!combo->m_hasVMT) return; + if (g_blockEventsOnDrag) return; - + if (combo->m_alreadySent) { combo->m_alreadySent = FALSE; @@ -43,13 +56,40 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox } combo->m_alreadySent = TRUE; - - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId()); - event.SetInt( combo->GetSelection() ); - wxString tmp( combo->GetStringSelection() ); - event.SetString( WXSTRINGCAST(tmp) ); - event.SetEventObject(combo); - combo->GetEventHandler()->ProcessEvent(event); + + int curSelection = combo->GetSelection(); + + if (combo->m_prevSelection != curSelection) + { + GtkWidget *list = GTK_COMBO(combo->m_widget)->list; + gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection ); + } + + combo->m_prevSelection = curSelection; + + wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() ); + event.SetInt( curSelection ); + event.SetString( combo->GetStringSelection() ); + event.SetEventObject( combo ); + + combo->GetEventHandler()->ProcessEvent( event ); +} + +//----------------------------------------------------------------------------- +// "changed" +//----------------------------------------------------------------------------- + +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 ); + combo->GetEventHandler()->ProcessEvent( event ); } //----------------------------------------------------------------------------- @@ -60,98 +100,129 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl) BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_SIZE(wxComboBox::OnSize) + EVT_CHAR(wxComboBox::OnChar) END_EVENT_TABLE() bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, int n, const wxString choices[], - long style, const wxValidator& validator, - const wxString& name ) + long style, const wxValidator& validator, + const wxString& name ) { m_alreadySent = FALSE; m_needParent = TRUE; m_acceptsFocus = TRUE; - - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); + m_prevSelection = 0; + + 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(); - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 100; - if (newSize.y == -1) newSize.y = 26; - SetSize( newSize.x, newSize.y ); - + + // make it more useable + gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE ); + + // and case-sensitive + gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE ); + + GtkWidget *list = GTK_COMBO(m_widget)->list; - + + gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE ); + for (int i = 0; i < n; i++) { - GtkWidget *list_item = gtk_list_item_new_with_label( choices[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 ); m_clientObjectList.Append( (wxObject*)NULL ); - + 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 ); + + m_focusWidget = GTK_COMBO(m_widget)->entry; + PostCreation(); ConnectWidget( GTK_COMBO(m_widget)->button ); - + 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 ); - - SetBackgroundColour( parent->GetBackgroundColour() ); + + 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); + + 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() ); Show( TRUE ); - + return TRUE; } 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, "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 ); - - gtk_signal_connect( GTK_OBJECT(list_item), "select", - GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); - + + GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() ); + gtk_container_add( GTK_CONTAINER(list), list_item ); - - if (m_widgetStyle) ApplyWidgetStyle(); - + + gtk_signal_connect( GTK_OBJECT(list_item), "select", + GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); + + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_realize( list_item ); + gtk_widget_realize( GTK_BIN(list_item)->child ); + + if (m_widgetStyle) ApplyWidgetStyle(); + } + gtk_widget_show( list_item ); } @@ -159,7 +230,7 @@ void wxComboBox::Append( const wxString &item ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL ); - + AppendCommon( item ); } @@ -167,7 +238,7 @@ void wxComboBox::Append( const wxString &item, void *clientData ) { m_clientDataList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*)NULL ); - + AppendCommon( item ); } @@ -175,60 +246,60 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData ) { m_clientDataList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) clientData ); - + AppendCommon( item ); } void wxComboBox::SetClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxNode *node = m_clientDataList.Nth( n ); if (!node) return; - + node->SetData( (wxObject*) clientData ); } void* wxComboBox::GetClientData( int n ) { - wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); + wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; - + return node->Data(); } void wxComboBox::SetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; - + wxClientData *cd = (wxClientData*) node->Data(); if (cd) delete cd; - + node->SetData( (wxObject*) clientData ); } wxClientData* wxComboBox::GetClientObject( int n ) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); + wxNode *node = m_clientDataList.Nth( n ); if (!node) return (wxClientData*) NULL; - + return (wxClientData*) node->Data(); } void wxComboBox::Clear() { - wxCHECK_RET( m_widget != NULL, "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() ); - + wxNode *node = m_clientObjectList.First(); while (node) { @@ -237,28 +308,28 @@ void wxComboBox::Clear() node = node->Next(); } m_clientObjectList.Clear(); - + m_clientDataList.Clear(); } void wxComboBox::Delete( int n ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list ); - + GList *child = g_list_nth( listbox->children, n ); - + if (!child) { - wxFAIL_MSG("wrong index"); + wxFAIL_MSG(wxT("wrong index")); return; } - - GList *list = g_list_append( NULL, child->data ); + + GList *list = g_list_append( (GList*) NULL, child->data ); gtk_list_remove_items( listbox, list ); g_list_free( list ); - + wxNode *node = m_clientObjectList.Nth( n ); if (node) { @@ -266,7 +337,7 @@ void wxComboBox::Delete( int n ) if (cd) delete cd; m_clientObjectList.DeleteNode( node ); } - + node = m_clientDataList.Nth( n ); if (node) { @@ -276,32 +347,31 @@ void wxComboBox::Delete( int n ) int wxComboBox::FindString( const wxString &item ) { - wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *child = GTK_LIST(list)->children; int count = 0; while (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - if (item == label->label) return count; + if (item == wxString(label->label,*wxConvCurrent)) + return count; count++; child = child->next; } - - wxFAIL_MSG( "wxComboBox: string not found" ); - - return -1; + + return wxNOT_FOUND; } int wxComboBox::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *selection = GTK_LIST(list)->selection; if (selection) { @@ -314,56 +384,57 @@ int wxComboBox::GetSelection() const child = child->next; } } - - wxFAIL_MSG( "wxComboBox: no selection" ); - + return -1; } wxString wxComboBox::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") ); + GtkWidget *list = GTK_COMBO(m_widget)->list; - + + wxString str; GList *child = g_list_nth( GTK_LIST(list)->children, n ); if (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - return label->label; + str = wxString(label->label,*wxConvCurrent); } - - wxFAIL_MSG( "wxComboBox: wrong index" ); - - return ""; + else + { + wxFAIL_MSG( wxT("wxComboBox: wrong index") ); + } + + return str; } wxString wxComboBox::GetStringSelection() const { - wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") ); + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *selection = GTK_LIST(list)->selection; 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( "wxComboBox: no selection" ); - - return ""; + + wxFAIL_MSG( wxT("wxComboBox: no selection") ); + + return wxT(""); } int wxComboBox::Number() const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" ); - + wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") ); + GtkWidget *list = GTK_COMBO(m_widget)->list; - + GList *child = GTK_LIST(list)->children; int count = 0; while (child) { count++; child = child->next; } @@ -372,16 +443,22 @@ int wxComboBox::Number() const void wxComboBox::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + + DisableEvents(); + GtkWidget *list = GTK_COMBO(m_widget)->list; + gtk_list_unselect_item( GTK_LIST(list), m_prevSelection ); gtk_list_select_item( GTK_LIST(list), n ); + m_prevSelection = n; + + EnableEvents(); } void wxComboBox::SetStringSelection( const wxString &string ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + int res = FindString( string ); if (res == -1) return; SetSelection( res ); @@ -390,26 +467,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, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; - wxString tmp = ""; + wxString tmp = wxT(""); if (!value.IsNull()) tmp = value; - gtk_entry_set_text( GTK_ENTRY(entry), tmp ); + gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() ); } void wxComboBox::Copy() { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if (GTK_MINOR_VERSION == 1) +#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); #else gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 ); @@ -418,10 +495,10 @@ void wxComboBox::Copy() void wxComboBox::Cut() { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if (GTK_MINOR_VERSION == 1) +#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); #else gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 ); @@ -430,10 +507,10 @@ void wxComboBox::Cut() void wxComboBox::Paste() { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; -#if (GTK_MINOR_VERSION == 1) +#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0) gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); #else gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 ); @@ -442,20 +519,17 @@ void wxComboBox::Paste() void wxComboBox::SetInsertionPoint( long pos ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + GtkWidget *entry = GTK_COMBO(m_widget)->entry; - int tmp = (int) pos; - gtk_entry_set_position( GTK_ENTRY(entry), tmp ); + gtk_entry_set_position( GTK_ENTRY(entry), (int)pos ); } void wxComboBox::SetInsertionPointEnd() { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - GtkWidget *entry = GTK_COMBO(m_widget)->entry; - int pos = GTK_ENTRY(entry)->text_length; - SetInsertionPoint( pos-1 ); + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + + SetInsertionPoint( -1 ); } long wxComboBox::GetInsertionPoint() const @@ -473,61 +547,131 @@ long wxComboBox::GetLastPosition() const void wxComboBox::Replace( long from, long to, const wxString& value ) { - wxCHECK_RET( m_widget != NULL, "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; gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); if (value.IsNull()) return; gint pos = (gint)to; - gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos ); + gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos ); } void wxComboBox::Remove(long from, long to) { - wxCHECK_RET( m_widget != NULL, "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 ); } -void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) ) +void wxComboBox::SetSelection( long from, long to ) +{ + GtkWidget *entry = GTK_COMBO(m_widget)->entry; + gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to ); +} + +void wxComboBox::SetEditable( bool editable ) +{ + GtkWidget *entry = GTK_COMBO(m_widget)->entry; + gtk_entry_set_editable( GTK_ENTRY(entry), editable ); +} + +void wxComboBox::OnChar( wxKeyEvent &event ) { - wxFAIL_MSG( "wxComboBox::SetSelection not implemented" ); + if ( event.KeyCode() == WXK_RETURN ) + { + wxString value = GetValue(); + + if ( Number() == 0 ) + { + // make Enter generate "selected" event if there is only one item + // in the combobox - without it, it's impossible to select it at + // all! + wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() ); + event.SetInt( 0 ); + event.SetString( value ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + } + else + { + // add the item to the list if it's not there yet + if ( FindString(value) == wxNOT_FOUND ) + { + Append(value); + SetStringSelection(value); + + // 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 ); + } + //else: do nothing, this will open the listbox + } + } + + event.Skip(); } -void wxComboBox::SetEditable( bool WXUNUSED(editable) ) +void wxComboBox::DisableEvents() { - wxFAIL_MSG( "wxComboBox::SetEditable not implemented" ); + 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 ); - + GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); GList *child = list->children; while (child) { gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); - + GtkBin *bin = GTK_BIN(child->data); gtk_widget_set_style( bin->child, m_widgetStyle ); - + child = child->next; } } @@ -543,6 +687,31 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window ) (window == GTK_COMBO(m_widget)->button->window ) ); } -#endif +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(); - // wxUSE_COMBOBOX \ No newline at end of file + 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