#include "wx/combobox.h"
-#include "wx/settings.h"
-#include "wx/arrstr.h"
-#include "wx/intl.h"
-
-#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+ #include "wx/settings.h"
+ #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
+ #include "wx/arrstr.h"
+#endif
// We use GtkCombo which has been deprecated since GTK+ 2.3.0
// in favour of GtkComboBox for <GTK2.4 runtime
static void
gtkcombo_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
if (combo->m_ignoreNextUpdate)
{
combo->m_ignoreNextUpdate = false;
static void
gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
if (!combo->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
// Quickly set the value of the combo box
// as GTK+ does that only AFTER the event
// is sent.
- g_signal_handlers_disconnect_by_func (GTK_COMBO (combo->GetHandle())->entry,
- (gpointer) gtkcombo_text_changed_callback,
- combo);
+ GtkWidget* entry = GTK_COMBO(combo->GetHandle())->entry;
+ g_signal_handlers_block_by_func(
+ entry, (gpointer)gtkcombo_text_changed_callback, combo);
combo->SetValue( combo->GetStringSelection() );
- g_signal_connect_after (GTK_COMBO (combo->GetHandle())->entry, "changed",
- G_CALLBACK (gtkcombo_text_changed_callback), combo);
+ g_signal_handlers_unblock_by_func(
+ entry, (gpointer)gtkcombo_text_changed_callback, combo);
// throw a SELECTED event only if the combobox popup is hidden (wxID_NONE)
// because when combobox popup is shown, gtkcombo_combo_select_child_callback is
static void
gtkcombobox_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() );
static void
gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
if (!combo->m_hasVMT) return;
+ if (combo->GetSelection() == -1)
+ return;
+
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
event.SetInt( combo->GetSelection() );
event.SetString( combo->GetStringSelection() );
combo->GetEventHandler()->ProcessEvent( event );
}
}
+
#endif
//-----------------------------------------------------------------------------
long style, const wxValidator& validator,
const wxString& name )
{
+ m_strings = NULL;
m_ignoreNextUpdate = false;
- m_needParent = true;
- m_acceptsFocus = true;
m_prevSelection = 0;
if (!PreCreation( parent, pos, size ) ||
return false;
}
+ if(HasFlag(wxCB_SORT))
+ m_strings = new wxSortedArrayString();
+
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
m_widget = gtk_combo_box_entry_new_text();
- GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE );
-
- for (int i = 0; i < n; i++)
- {
- gtk_combo_box_append_text( combobox, wxGTK_CONV( choices[i] ) );
-
- m_clientDataList.Append( (wxObject*)NULL );
- m_clientObjectList.Append( (wxObject*)NULL );
- }
}
else
#endif
gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
if (style & wxNO_BORDER)
- g_object_set( GTK_ENTRY( combo->entry ), "has-frame", FALSE, NULL );
-
- GtkWidget *list = combo->list;
-
- for (int i = 0; i < n; i++)
- {
- GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );
-
- m_clientDataList.Append( (wxObject*)NULL );
- m_clientObjectList.Append( (wxObject*)NULL );
-
- gtk_container_add( GTK_CONTAINER(list), list_item );
-
- gtk_widget_show( list_item );
- }
+ g_object_set (combo->entry, "has-frame", FALSE, NULL );
}
+ Append(n, choices);
m_parent->DoAddChild( this );
g_signal_connect_after (m_widget, "changed",
G_CALLBACK (gtkcombobox_changed_callback), this);
+
}
else
#endif
this);
g_signal_connect_after (entry, "changed",
G_CALLBACK (gtkcombo_text_changed_callback), this);
-
- // This is required for tool bar support
- // Doesn't currently work
-// wxSize setsize = GetSize();
-// gtk_widget_set_size_request( m_widget, setsize.x, setsize.y );
}
- SetBestSize(size); // need this too because this is a wxControlWithItems
-
+ SetInitialSize(size); // need this too because this is a wxControlWithItems
return true;
}
wxComboBox::~wxComboBox()
{
- wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
- while (node)
- {
- wxClientData *cd = (wxClientData*)node->GetData();
- if (cd) delete cd;
- node = node->GetNext();
- }
- m_clientObjectList.Clear();
+ Clear();
- m_clientDataList.Clear();
+ delete m_strings;
}
void wxComboBox::SetFocus()
gtk_widget_grab_focus( m_focusWidget );
}
-int wxComboBox::DoAppend( const wxString &item )
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
+ wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+ _T("In a sorted combobox data could only be appended"));
+
+ const int count = items.GetCount();
+
+ int n = wxNOT_FOUND;
+
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
- gtk_combo_box_append_text( combobox, wxGTK_CONV( item ) );
+ for( int i = 0; i < count; ++i )
+ {
+ n = pos + i;
+ // If sorted, use this wxSortedArrayStrings to determine
+ // the right insertion point
+ if(m_strings)
+ n = m_strings->Add(items[i]);
+
+ gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );
+
+ m_clientData.Insert( NULL, n );
+ AssignNewItemClientData(n, clientData, i, type);
+ }
}
else
#endif
DisableEvents();
GtkWidget *list = GTK_COMBO(m_widget)->list;
- GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
- gtk_container_add( GTK_CONTAINER(list), list_item );
-
- if (GTK_WIDGET_REALIZED(m_widget))
+ for( int i = 0; i < count; ++i )
{
- gtk_widget_realize( list_item );
- gtk_widget_realize( GTK_BIN(list_item)->child );
- }
+ n = pos + i;
+ // If sorted, use this wxSortedArrayStrings to determine
+ // the right insertion point
+ if(m_strings)
+ n = m_strings->Add(items[i]);
- // Apply current widget style to the new list_item
- GtkRcStyle *style = CreateWidgetStyle();
- if (style)
- {
- gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
- GtkBin *bin = GTK_BIN( list_item );
- GtkWidget *label = GTK_WIDGET( bin->child );
- gtk_widget_modify_style( label, style );
- gtk_rc_style_unref( style );
- }
+ GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( items[i] ) );
- gtk_widget_show( list_item );
+ // TODO construct a list with all items and call gtk_list_insert_items once?
+ GList *gitem_list = g_list_alloc ();
+ gitem_list->data = list_item;
+ gtk_list_insert_items( GTK_LIST (list), gitem_list, n );
- EnableEvents();
- }
+ m_clientData.Insert( NULL, n );
+ AssignNewItemClientData(n, clientData, i, type);
- const size_t count = GetCount();
-
- if ( m_clientDataList.GetCount() < count )
- m_clientDataList.Append( (wxObject*) NULL );
- if ( m_clientObjectList.GetCount() < count )
- m_clientObjectList.Append( (wxObject*) NULL );
-
- InvalidateBestSize();
-
- return count - 1;
-}
-
-int wxComboBox::DoInsert( const wxString &item, int pos )
-{
- wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
- wxT("can't insert into sorted list"));
-
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
- wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") );
-
- const size_t count = GetCount();
-
- if ((size_t)pos == count)
- return Append(item);
-
-#ifdef __WXGTK24__
- if (!gtk_check_version(2,4,0))
- {
- GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
- gtk_combo_box_insert_text( combobox, pos, wxGTK_CONV( item ) );
- }
- else
-#endif
- {
- DisableEvents();
-
- GtkWidget *list = GTK_COMBO(m_widget)->list;
- GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
- GList *gitem_list = g_list_alloc ();
- gitem_list->data = list_item;
- gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_realize( list_item );
+ gtk_widget_realize( GTK_BIN(list_item)->child );
- if (GTK_WIDGET_REALIZED(m_widget))
- {
- gtk_widget_realize( list_item );
- gtk_widget_realize( GTK_BIN(list_item)->child );
+ ApplyWidgetStyle();
+ }
- ApplyWidgetStyle();
+ gtk_widget_show( list_item );
}
- gtk_widget_show( list_item );
-
EnableEvents();
}
- count = GetCount();
-
- if ( m_clientDataList.GetCount() < count )
- m_clientDataList.Insert( pos, (wxObject*) NULL );
- if ( m_clientObjectList.GetCount() < count )
- m_clientObjectList.Insert( pos, (wxObject*) NULL );
-
InvalidateBestSize();
- return pos;
+ return n;
}
-void wxComboBox::DoSetItemClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{
- wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
- wxList::compatibility_iterator node = m_clientDataList.Item( n );
- if (!node) return;
-
- node->SetData( (wxObject*) clientData );
-}
-
-void* wxComboBox::DoGetItemClientData( int n ) const
-{
- wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
- wxList::compatibility_iterator node = m_clientDataList.Item( n );
-
- return node ? node->GetData() : NULL;
-}
-
-void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
- wxList::compatibility_iterator node = m_clientObjectList.Item( n );
- if (!node) return;
-
- // wxItemContainer already deletes data for us
-
- node->SetData( (wxObject*) clientData );
+ m_clientData[n] = clientData;
}
-wxClientData* wxComboBox::DoGetItemClientObject( int n ) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
- wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-
- return node ? (wxClientData*) node->GetData() : NULL;
+ return m_clientData[n];
}
-void wxComboBox::Clear()
+void wxComboBox::DoClear()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
if (!gtk_check_version(2,4,0))
{
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
- size_t i;
- for (i = 0; i < GetCount(); i++)
+ const unsigned int count = GetCount();
+ for (unsigned int i = 0; i < count; i++)
gtk_combo_box_remove_text( combobox, 0 );
}
- else
-#endif
+ else // GTK+ < 2.4.0
+#endif // __WXGTK24__
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
}
- wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
- while (node)
- {
- wxClientData *cd = (wxClientData*)node->GetData();
- if (cd) delete cd;
- node = node->GetNext();
- }
- m_clientObjectList.Clear();
+ m_clientData.Clear();
- m_clientDataList.Clear();
+ if(m_strings)
+ m_strings->Clear();
EnableEvents();
InvalidateBestSize();
}
-void wxComboBox::Delete( int n )
+void wxComboBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
EnableEvents();
}
- wxList::compatibility_iterator node = m_clientObjectList.Item( n );
- if (node)
- {
- wxClientData *cd = (wxClientData*)node->GetData();
- if (cd) delete cd;
- m_clientObjectList.Erase( node );
- }
-
- node = m_clientDataList.Item( n );
- if (node)
- m_clientDataList.Erase( node );
+ m_clientData.RemoveAt( n );
+ if(m_strings)
+ m_strings->RemoveAt( n );
InvalidateBestSize();
}
-void wxComboBox::SetString(int n, const wxString &text)
+void wxComboBox::SetString(unsigned int n, const wxString &text)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
return -1;
}
-wxString wxComboBox::GetString( int n ) const
+wxString wxComboBox::GetString(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
int sel = gtk_combo_box_get_active( combobox );
if (sel == -1)
return wxEmptyString;
- return GetString( sel );
+ return GetString(sel);
}
else
#endif
return wxEmptyString;
}
-size_t wxComboBox::GetCount() const
+unsigned int wxComboBox::GetCount() const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
gtk_tree_model_get_iter_first( model, &iter );
if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
return 0;
- size_t ret = 1;
+ unsigned int ret = 1;
while (gtk_tree_model_iter_next( model, &iter ))
ret++;
return ret;
GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = GTK_LIST(list)->children;
- size_t count = 0;
- while (child) { count++; child = child->next; }
+ unsigned int count = 0;
+ while (child)
+ {
+ count++;
+ child = child->next;
+ }
return count;
}
wxString tmp;
if (!value.IsNull()) tmp = value;
+
+ DisableEvents();
gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
+ EnableEvents();
InvalidateBestSize();
}
if (value.IsNull()) return;
gint pos = (gint)to;
-#if wxUSE_UNICODE
- wxCharBuffer buffer = wxConvUTF8.cWX2MB( value );
- gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos );
+ // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
+#if wxUSE_UNICODE_UTF8
+ const char *utf8 = value.utf8_str();
#else
- gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.length(), &pos );
+ wxCharBuffer buffer(value.utf8_str());
+ const char *utf8 = buffer;
#endif
+ gtk_editable_insert_text(GTK_EDITABLE(entry), utf8, strlen(utf8), &pos);
}
void wxComboBox::SetSelection( long from, long to )
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
- g_signal_handlers_disconnect_by_func (GTK_BIN(m_widget)->child,
- (gpointer)gtkcombobox_text_changed_callback, this);
+ g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+ (gpointer)gtkcombobox_text_changed_callback, this);
- g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer)gtkcombobox_changed_callback, this);
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer)gtkcombobox_changed_callback, this);
}
else
#endif
{
- g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->list,
- (gpointer) gtkcombo_combo_select_child_callback, this);
+ g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->list,
+ (gpointer) gtkcombo_combo_select_child_callback, this);
- g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->entry,
- (gpointer) gtkcombo_text_changed_callback, this);
+ g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->entry,
+ (gpointer) gtkcombo_text_changed_callback, this);
}
}
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
- g_signal_connect_after (GTK_BIN(m_widget)->child, "changed",
- G_CALLBACK (gtkcombobox_text_changed_callback), this);
+ g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+ (gpointer)gtkcombobox_text_changed_callback, this);
- g_signal_connect_after (m_widget, "changed",
- G_CALLBACK (gtkcombobox_changed_callback), this);
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer)gtkcombobox_changed_callback, this);
}
else
#endif
{
- g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child",
- G_CALLBACK (gtkcombo_combo_select_child_callback),
- this);
- g_signal_connect_after (GTK_COMBO(m_widget)->entry, "changed",
- G_CALLBACK (gtkcombo_text_changed_callback),
- this );
+ g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->list,
+ (gpointer) gtkcombo_combo_select_child_callback, this);
+
+ g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->entry,
+ (gpointer) gtkcombo_text_changed_callback, this);
}
}
return GTK_WIDGET( entry );
}
-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
{
- GtkEntry *entry = NULL;
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
- entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
- return (window == entry->text_area);
+ wxUnusedVar(windows);
+
+ return GTK_ENTRY(GTK_BIN(m_widget)->child)->text_area;
}
else
-#endif
+#endif // GTK+ 2.4
{
- entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
- return ( (window == entry->text_area) ||
- (window == GTK_COMBO(m_widget)->button->window ) );
+ windows.push_back(GTK_ENTRY(GTK_COMBO(m_widget)->entry)->text_area);
+ windows.push_back(GTK_COMBO(m_widget)->button->window);
+
+ // indicate that we return multiple windows in the windows array
+ return NULL;
}
}
if ( m_widget )
{
int width;
- size_t count = GetCount();
- for ( size_t n = 0; n < count; n++ )
+ unsigned int count = GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
- GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
+ GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
if ( width > ret.x )
ret.x = width;
}
projects / wxWidgets.git / blobdiff