X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30ed6e5c897215ee8647b7954ad933ed3a765738..f7ff39c6ac67b995c13900af1b6a4b32e8c7f9f2:/src/gtk/combobox.cpp?ds=sidebyside diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 13d19d958b..acf403570b 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -7,15 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "combobox.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/combobox.h" #if wxUSE_COMBOBOX #include "wx/settings.h" +#include "wx/arrstr.h" #include "wx/intl.h" #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED @@ -99,6 +103,19 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl) EVT_CHAR(wxComboBox::OnChar) END_EVENT_TABLE() +bool wxComboBox::Create( wxWindow *parent, wxWindowID id, + const wxString& value, + const wxPoint& pos, const wxSize& size, + const wxArrayString& choices, + long style, const wxValidator& validator, + const wxString& name ) +{ + wxCArrayString chs(choices); + + return Create( parent, id, value, pos, size, chs.GetCount(), + chs.GetStrings(), style, validator, name ); +} + bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, int n, const wxString choices[], @@ -154,7 +171,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, m_focusWidget = combo->entry; - PostCreation(); + PostCreation(size); ConnectWidget( combo->button ); @@ -171,33 +188,18 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, gtk_signal_connect( GTK_OBJECT(combo->list), "select-child", GTK_SIGNAL_FUNC(gtk_combo_select_child_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 ); - - // This is required for tool bar support - gtk_widget_set_usize( m_widget, new_size.x, new_size.y ); - } - - SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - SetForegroundColour( parent->GetForegroundColour() ); - - Show( TRUE ); + SetBestSize(size); // need this too because this is a wxControlWithItems + // This is required for tool bar support + wxSize setsize = GetSize(); + gtk_widget_set_usize( m_widget, setsize.x, setsize.y ); + return TRUE; } wxComboBox::~wxComboBox() { - wxNode *node = m_clientObjectList.GetFirst(); + wxList::compatibility_iterator node = m_clientObjectList.GetFirst(); while (node) { wxClientData *cd = (wxClientData*)node->GetData(); @@ -220,9 +222,9 @@ void wxComboBox::SetFocus() gtk_widget_grab_focus( m_focusWidget ); } -void wxComboBox::AppendCommon( const wxString &item ) +int wxComboBox::DoAppend( const wxString &item ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); DisableEvents(); @@ -237,50 +239,35 @@ void wxComboBox::AppendCommon( const wxString &item ) gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - if (m_widgetStyle) ApplyWidgetStyle(); + ApplyWidgetStyle(); } gtk_widget_show( list_item ); - EnableEvents(); -} + const int count = GetCount(); -void wxComboBox::Append( const wxString &item ) -{ + if ( (int)m_clientDataList.GetCount() < count ) m_clientDataList.Append( (wxObject*) NULL ); + if ( (int)m_clientObjectList.GetCount() < count ) m_clientObjectList.Append( (wxObject*) NULL ); - AppendCommon( item ); -} - -void wxComboBox::Append( const wxString &item, void *clientData ) -{ - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*)NULL ); + EnableEvents(); - AppendCommon( item ); + return count - 1; } -void wxComboBox::Append( const wxString &item, wxClientData *clientData ) +int wxComboBox::DoInsert( const wxString &item, int pos ) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) clientData ); + wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, + wxT("can't insert into sorted list")); - AppendCommon( item ); -} - -void wxComboBox::InsertCommon( const wxString &item, int pos ) -{ - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); + wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") ); + if (pos == count) - { - AppendCommon(item); - return; - } + return Append(item); DisableEvents(); @@ -297,102 +284,59 @@ void wxComboBox::InsertCommon( const wxString &item, int pos ) gtk_widget_realize( list_item ); gtk_widget_realize( GTK_BIN(list_item)->child ); - if (m_widgetStyle) ApplyWidgetStyle(); + ApplyWidgetStyle(); } gtk_widget_show( list_item ); - EnableEvents(); -} - -void wxComboBox::Insert( const wxString &item, int pos ) -{ - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); - if (pos == count) - { - Append(item); - return; - } + count = GetCount(); + if ( (int)m_clientDataList.GetCount() < count ) m_clientDataList.Insert( pos, (wxObject*) NULL ); + if ( (int)m_clientObjectList.GetCount() < count ) m_clientObjectList.Insert( pos, (wxObject*) NULL ); - InsertCommon( item, pos ); -} - -void wxComboBox::Insert( const wxString &item, int pos, void *clientData ) -{ - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); - if (pos == count) - { - Append(item, clientData); - return; - } - - m_clientDataList.Insert( pos, (wxObject*) clientData ); - m_clientObjectList.Insert( pos, (wxObject*)NULL ); - - InsertCommon( item, pos ); -} - -void wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData ) -{ - wxCHECK_RET(!(GetWindowStyle() & wxCB_SORT), wxT("can't insert into sorted list")); - int count = GetCount(); - wxCHECK_RET((pos>=0) && (pos<=count), wxT("invalid index")); - if (pos == count) - { - Append(item, clientData); - return; - } - - m_clientDataList.Insert( pos, (wxObject*) NULL ); - m_clientObjectList.Insert( pos, (wxObject*) clientData ); + EnableEvents(); - InsertCommon( item, pos ); + return pos; } -void wxComboBox::SetClientData( int n, void* clientData ) +void wxComboBox::DoSetItemClientData( int n, void* clientData ) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - wxNode *node = m_clientDataList.Item( n ); + wxList::compatibility_iterator node = m_clientDataList.Item( n ); if (!node) return; node->SetData( (wxObject*) clientData ); } -void* wxComboBox::GetClientData( int n ) const +void* wxComboBox::DoGetItemClientData( int n ) const { wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); - wxNode *node = m_clientDataList.Item( n ); + wxList::compatibility_iterator node = m_clientDataList.Item( n ); return node ? node->GetData() : NULL; } -void wxComboBox::SetClientObject( int n, wxClientData* clientData ) +void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData ) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - wxNode *node = m_clientObjectList.Item( n ); + wxList::compatibility_iterator node = m_clientObjectList.Item( n ); if (!node) return; - wxClientData *cd = (wxClientData*) node->GetData(); - if (cd) delete cd; + // wxItemContainer already deletes data for us node->SetData( (wxObject*) clientData ); } -wxClientData* wxComboBox::GetClientObject( int n ) const +wxClientData* wxComboBox::DoGetItemClientObject( int n ) const { wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") ); - wxNode *node = m_clientObjectList.Item( n ); + wxList::compatibility_iterator node = m_clientObjectList.Item( n ); return node ? (wxClientData*) node->GetData() : NULL; } @@ -404,9 +348,9 @@ void wxComboBox::Clear() DisableEvents(); GtkWidget *list = GTK_COMBO(m_widget)->list; - gtk_list_clear_items( GTK_LIST(list), 0, Number() ); + gtk_list_clear_items( GTK_LIST(list), 0, GetCount() ); - wxNode *node = m_clientObjectList.GetFirst(); + wxList::compatibility_iterator node = m_clientObjectList.GetFirst(); while (node) { wxClientData *cd = (wxClientData*)node->GetData(); @@ -440,18 +384,18 @@ void wxComboBox::Delete( int n ) gtk_list_remove_items( listbox, list ); g_list_free( list ); - wxNode *node = m_clientObjectList.Item( n ); + wxList::compatibility_iterator node = m_clientObjectList.Item( n ); if (node) { wxClientData *cd = (wxClientData*)node->GetData(); if (cd) delete cd; - m_clientObjectList.DeleteNode( node ); + m_clientObjectList.Erase( node ); } node = m_clientDataList.Item( n ); if (node) - m_clientDataList.DeleteNode( node ); - + m_clientDataList.Erase( node ); + EnableEvents(); } @@ -474,7 +418,7 @@ void wxComboBox::SetString(int n, const wxString &text) } } -int wxComboBox::FindString( const wxString &item ) +int wxComboBox::FindString( const wxString &item ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") ); @@ -573,7 +517,7 @@ wxString wxComboBox::GetStringSelection() const return wxT(""); } -int wxComboBox::Number() const +int wxComboBox::GetCount() const { wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") ); @@ -599,13 +543,14 @@ void wxComboBox::SetSelection( int n ) EnableEvents(); } -void wxComboBox::SetStringSelection( const wxString &string ) +bool wxComboBox::SetStringSelection( const wxString &string ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") ); int res = FindString( string ); - if (res == -1) return; + if (res == -1) return false; SetSelection( res ); + return true; } wxString wxComboBox::GetValue() const @@ -663,17 +608,13 @@ void wxComboBox::SetInsertionPoint( long pos ) { wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + if ( pos == GetLastPosition() ) + pos = -1; + GtkWidget *entry = GTK_COMBO(m_widget)->entry; gtk_entry_set_position( GTK_ENTRY(entry), (int)pos ); } -void wxComboBox::SetInsertionPointEnd() -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - SetInsertionPoint( -1 ); -} - long wxComboBox::GetInsertionPoint() const { return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry ); @@ -703,14 +644,6 @@ void wxComboBox::Replace( long from, long to, const wxString& value ) #endif } -void wxComboBox::Remove(long from, long to) -{ - 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 from, long to ) { GtkWidget *entry = GTK_COMBO(m_widget)->entry; @@ -788,22 +721,20 @@ void wxComboBox::OnSize( wxSizeEvent &event ) #endif // 0 } -void wxComboBox::ApplyWidgetStyle() +void wxComboBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - -// 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 ); +// gtk_widget_modify_style( GTK_COMBO(m_widget)->button, syle ); + gtk_widget_modify_style( GTK_COMBO(m_widget)->entry, style ); + gtk_widget_modify_style( GTK_COMBO(m_widget)->list, style ); 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 ); + gtk_widget_modify_style( GTK_WIDGET(child->data), style ); GtkBin *bin = GTK_BIN(child->data); - gtk_widget_set_style( bin->child, m_widgetStyle ); + gtk_widget_modify_style( bin->child, style ); child = child->next; } @@ -833,7 +764,7 @@ wxSize wxComboBox::DoGetBestSize() const size_t count = GetCount(); for ( size_t n = 0; n < count; n++ ) { - GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font ); + GetTextExtent( GetString(n), &width, NULL, NULL, NULL ); if ( width > ret.x ) ret.x = width; } @@ -842,7 +773,16 @@ wxSize wxComboBox::DoGetBestSize() const // empty combobox should have some reasonable default size too if ( ret.x < 100 ) ret.x = 100; + + CacheBestSize(ret); return ret; } +// static +wxVisualAttributes +wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true); +} + #endif