#include "wx/arrstr.h"
#endif
+#include <gtk/gtk.h>
#include "wx/gtk/private.h"
-
+#include "wx/gtk/private/gtk2-compat.h"
// ----------------------------------------------------------------------------
// GTK callbacks
// wxChoice
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
-wxChoice::wxChoice()
- : m_strings(NULL)
+void wxChoice::Init()
{
+ m_strings = NULL;
+ m_stringCellIndex = 0;
}
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator,
const wxString &name )
{
- m_strings = NULL;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
{
// if our m_strings != NULL, Append() will check for it and insert
// items in the correct order
- m_strings = new wxSortedArrayString;
+ m_strings = new wxGtkCollatedArrayString;
}
+#ifdef __WXGTK3__
+ m_widget = gtk_combo_box_text_new();
+#else
m_widget = gtk_combo_box_new_text();
+#endif
+ g_object_ref(m_widget);
Append(n, choices);
HandleWindowEvent( event );
}
+void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
+{
+#ifdef __WXGTK3__
+ gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(m_widget), n, wxGTK_CONV(text));
+#else
+ gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) );
+#endif
+}
+
int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData, wxClientDataType type)
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
- _T("In a sorted choice data could only be appended"));
+ wxT("In a sorted choice data could only be appended"));
const int count = items.GetCount();
int n = wxNOT_FOUND;
- GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
for ( int i = 0; i < count; ++i )
{
n = pos + i;
// If sorted, use this wxSortedArrayStrings to determine
// the right insertion point
- if(m_strings)
+ if (m_strings)
n = m_strings->Add(items[i]);
- gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );
+ GTKInsertComboBoxTextItem( n, items[i] );
m_clientData.Insert( NULL, n );
AssignNewItemClientData(n, clientData, i, type);
{
wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- DisableEvents();
+ GTKDisableEvents();
- const unsigned int count = GetCount();
- for (unsigned int i = 0; i < count; i++)
- gtk_combo_box_remove_text( GTK_COMBO_BOX(m_widget), 0 );
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+ gtk_list_store_clear(GTK_LIST_STORE(model));
m_clientData.Clear();
if (m_strings)
m_strings->Clear();
- EnableEvents();
+ GTKEnableEvents();
InvalidateBestSize();
}
void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );
+
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+ GtkListStore* store = GTK_LIST_STORE(model);
+ GtkTreeIter iter;
+ gtk_tree_model_iter_nth_child( model, &iter,
+ NULL, (gint) n );
+ gtk_list_store_remove( store, &iter );
- gtk_combo_box_remove_text( GTK_COMBO_BOX( m_widget ), n );
m_clientData.RemoveAt( n );
if ( m_strings )
m_strings->RemoveAt( n );
do
{
GValue value = { 0, };
- gtk_tree_model_get_value( model, &iter, 0, &value );
+ gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) );
g_value_unset( &value );
GValue value = { 0, };
g_value_init( &value, G_TYPE_STRING );
g_value_set_string( &value, wxGTK_CONV( text ) );
- gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, 0, &value );
+ gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, m_stringCellIndex, &value );
g_value_unset( &value );
}
if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
{
GValue value = { 0, };
- gtk_tree_model_get_value( model, &iter, 0, &value );
+ gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value );
wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) );
g_value_unset( &value );
return tmp;
{
wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- DisableEvents();
+ GTKDisableEvents();
GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
gtk_combo_box_set_active( combobox, n );
- EnableEvents();
+ GTKEnableEvents();
}
-void wxChoice::DisableEvents()
+void wxChoice::SetColumns(int n)
+{
+ gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n);
+}
+
+int wxChoice::GetColumns() const
+{
+ // gtk_combo_box_get_wrap_width() was added in gtk 2.6
+ gint intval;
+ g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL);
+ return intval;
+}
+
+
+void wxChoice::GTKDisableEvents()
{
g_signal_handlers_block_by_func(m_widget,
(gpointer) gtk_choice_changed_callback, this);
}
-void wxChoice::EnableEvents()
+void wxChoice::GTKEnableEvents()
{
g_signal_handlers_unblock_by_func(m_widget,
(gpointer) gtk_choice_changed_callback, this);
GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- return m_widget->window;
+ return gtk_widget_get_window(m_widget);
+}
+
+// Notice that this method shouldn't be necessary, because GTK calculates
+// properly size of the combobox but for unknown reasons it doesn't work
+// correctly in wx without this.
+wxSize wxChoice::DoGetBestSize() const
+{
+ // strangely, this returns a width of 188 pixels from GTK+ (?)
+ wxSize ret( wxControl::DoGetBestSize() );
+
+ // we know better our horizontal extent: it depends on the longest string
+ // in the combobox
+ if ( m_widget )
+ {
+ ret.x = GetCount() > 0 ? 0 : 60; // start with something "sensible"
+ int width;
+ unsigned int count = GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
+ {
+ GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
+ if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text
+ ret.x = width + 40;
+ }
+ }
+
+ // empty combobox should have some reasonable default size too
+ if ((GetCount() == 0) && (ret.x < 80))
+ ret.x = 80;
+
+ CacheBestSize(ret);
+ return ret;
+}
+
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+ GTKApplyStyle(m_widget, style);
+ GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
}
+
// static
wxVisualAttributes
wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
projects / wxWidgets.git / blobdiff