// 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
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[],
m_focusWidget = combo->entry;
- PostCreation();
+ PostCreation(size);
ConnectWidget( combo->button );
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;
}
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();
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 );
-
- AppendCommon( item );
-}
+ wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
+ wxT("can't insert into sorted list"));
-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();
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") );
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") );
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") );
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") );
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() );
wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
while (node)
}
}
-int wxComboBox::FindString( const wxString &item )
+int wxComboBox::FindString( const wxString &item ) const
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
return wxT("");
}
-int wxComboBox::Number() const
+int wxComboBox::GetCount() const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
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
{
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 );
#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;
#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;
}
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;
}
// 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