// 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/combobox.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
#endif
#include "wx/gtk/private.h"
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
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() );
{
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_widget = gtk_combo_new();
GtkCombo* combo = GTK_COMBO(m_widget);
-
+
// Disable GTK's broken events ...
g_signal_handler_disconnect (combo->entry, combo->entry_change_id);
// ... and add surrogate handler.
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 );
-
+ g_object_set (combo->entry, "has-frame", FALSE, NULL );
+
GtkWidget *list = combo->list;
for (int i = 0; i < n; i++)
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
m_focusWidget = GTK_WIDGET( entry );
PostCreation(size);
if (!gtk_check_version(2,4,0))
{
gtk_entry_set_text( entry, wxGTK_CONV(value) );
-
+
if (style & wxCB_READONLY)
gtk_entry_set_editable( entry, FALSE );
-
+
g_signal_connect_after (entry, "changed",
G_CALLBACK (gtkcombobox_text_changed_callback), this);
-
+
g_signal_connect_after (m_widget, "changed",
G_CALLBACK (gtkcombobox_changed_callback), this);
}
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();
EnableEvents();
}
-
- const int count = GetCount();
- if ( (int)m_clientDataList.GetCount() < count )
+ const unsigned int count = GetCount();
+
+ if ( m_clientDataList.GetCount() < count )
m_clientDataList.Append( (wxObject*) NULL );
- if ( (int)m_clientObjectList.GetCount() < count )
+ if ( m_clientObjectList.GetCount() < count )
m_clientObjectList.Append( (wxObject*) NULL );
InvalidateBestSize();
return count - 1;
}
-int wxComboBox::DoInsert( const wxString &item, int pos )
+int wxComboBox::DoInsert(const wxString &item, unsigned 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") );
- int count = GetCount();
- wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+ unsigned int count = GetCount();
if (pos == count)
return Append(item);
EnableEvents();
}
-
+
count = GetCount();
- if ( (int)m_clientDataList.GetCount() < count )
+ if ( m_clientDataList.GetCount() < count )
m_clientDataList.Insert( pos, (wxObject*) NULL );
- if ( (int)m_clientObjectList.GetCount() < count )
+ if ( m_clientObjectList.GetCount() < count )
m_clientObjectList.Insert( pos, (wxObject*) NULL );
InvalidateBestSize();
return pos;
}
-void wxComboBox::DoSetItemClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
node->SetData( (wxObject*) clientData );
}
-void* wxComboBox::DoGetItemClientData( int n ) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
return node ? node->GetData() : NULL;
}
-void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
node->SetData( (wxObject*) clientData );
}
-wxClientData* wxComboBox::DoGetItemClientObject( int n ) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
if (!gtk_check_version(2,4,0))
{
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
- int i;
- for (i = 0; i++; i < GetCount())
+ 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;
+ delete cd;
node = node->GetNext();
}
m_clientObjectList.Clear();
InvalidateBestSize();
}
-void wxComboBox::Delete( int n )
+void wxComboBox::Delete(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
- wxCHECK_RET( (n >= 0) && (n <= GetCount()), wxT("invalid index") );
-
+ wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
gtk_combo_box_remove_text( combobox, n );
}
EnableEvents();
}
-
+
wxList::compatibility_iterator node = m_clientObjectList.Item( n );
if (node)
{
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") );
if (!gtk_check_version(2,4,0))
{
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
- wxCHECK_RET( (n >= 0) && (n <= GetCount()), wxT("invalid index") );
-
+ wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
GtkTreeModel *model = gtk_combo_box_get_model( combobox );
GtkTreeIter iter;
if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
wxFAIL_MSG( wxT("wxComboBox: wrong index") );
}
}
-
+
InvalidateBestSize();
}
if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter ))
return -1;
int count = 0;
- do
+ do
{
GValue value = { 0, };
gtk_tree_model_get_value( model, &iter, 0, &value );
wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
g_value_unset( &value );
-
+
if (item.IsSameAs( str, bCase ) )
return count;
-
+
count++;
-
+
} while (gtk_tree_model_iter_next( model, &iter ));
}
else
return -1;
}
-wxString wxComboBox::GetString( int n ) const
+wxString wxComboBox::GetString(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid combobox") );
wxString str;
-
+
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
}
else
#endif
- {
+ {
GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = g_list_nth( GTK_LIST(list)->children, n );
int sel = gtk_combo_box_get_active( combobox );
if (sel == -1)
return wxEmptyString;
- return GetString( sel );
+ return GetString(sel);
}
else
#endif
- {
+ {
GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *selection = GTK_LIST(list)->selection;
return wxEmptyString;
}
-int 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;
- int ret = 1;
+ unsigned int ret = 1;
while (gtk_tree_model_iter_next( model, &iter ))
ret++;
return ret;
}
else
#endif
- {
+ {
GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = GTK_LIST(list)->children;
- int count = 0;
- while (child) { count++; child = child->next; }
+ unsigned int count = 0;
+ while (child)
+ {
+ count++;
+ child = child->next;
+ }
return count;
}
-
+
return 0;
}
gtk_list_select_item( GTK_LIST(list), n );
m_prevSelection = n;
}
-
+
EnableEvents();
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
#if 0
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
wxString tmp;
if (!value.IsNull()) tmp = value;
gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
gtk_editable_copy_clipboard(GTK_EDITABLE(entry));
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
gtk_editable_cut_clipboard(GTK_EDITABLE(entry));
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
gtk_editable_paste_clipboard(GTK_EDITABLE(entry));
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
gtk_entry_set_position( entry, (int)pos );
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
return (long) gtk_editable_get_position(GTK_EDITABLE(entry));
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
int pos = entry->text_length;
return (long) pos-1;
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_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;
wxCharBuffer buffer = wxConvUTF8.cWX2MB( value );
gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos );
#else
- gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.Length(), &pos );
+ gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.length(), &pos );
#endif
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
}
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
if (IsEditable())
{
GtkEditable *editable = GTK_EDITABLE(entry);
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
gtk_entry_set_editable( GTK_ENTRY(entry), editable );
}
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
{
- g_signal_handlers_disconnect_by_func (GTK_BIN(m_widget)->child,
+ g_signal_handlers_disconnect_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);
}
else
-#endif
+#endif
{
g_signal_handlers_disconnect_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_connect_after (GTK_BIN(m_widget)->child, "changed",
G_CALLBACK (gtkcombobox_text_changed_callback), this);
-
+
g_signal_connect_after (m_widget, "changed",
G_CALLBACK (gtkcombobox_changed_callback), this);
}
else
-#endif
+#endif
{
g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child",
G_CALLBACK (gtkcombo_combo_select_child_callback),
if (!gtk_check_version(2,4,0))
entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
else
-#endif
+#endif
entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-
+
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