#pragma implementation "combobox.h"
#endif
-
#include "wx/combobox.h"
+#if wxUSE_COMBOBOX
+
+#include "wx/settings.h"
+
#include <wx/intl.h>
#include "gdk/gdk.h"
#include "gtk/gtk.h"
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
// "select"
//-----------------------------------------------------------------------------
-static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+static void
+gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- if (!combo->HasVMT()) return;
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ if (!combo->m_hasVMT) return;
+
if (g_blockEventsOnDrag) return;
if (combo->m_alreadySent)
combo->m_alreadySent = TRUE;
- wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId());
+ wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
event.SetInt( combo->GetSelection() );
- wxString tmp( combo->GetStringSelection() );
- event.SetString( WXSTRINGCAST(tmp) );
- event.SetEventObject(combo);
- combo->GetEventHandler()->ProcessEvent(event);
+ event.SetString( combo->GetStringSelection() );
+ event.SetEventObject( combo );
+
+ combo->GetEventHandler()->ProcessEvent( event );
}
//-----------------------------------------------------------------------------
static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->m_windowId );
- event.SetString( copystring(combo->GetValue()) );
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ if (!combo->m_hasVMT) return;
+
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
+ event.SetString( combo->GetValue() );
event.SetEventObject( combo );
combo->GetEventHandler()->ProcessEvent( event );
- delete[] event.GetString();
}
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
EVT_SIZE(wxComboBox::OnSize)
+ EVT_CHAR(wxComboBox::OnChar)
END_EVENT_TABLE()
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
PreCreation( parent, id, pos, size, style, name );
+#if wxUSE_VALIDATORS
SetValidator( validator );
+#endif
m_widget = gtk_combo_new();
+ // make it more useable
+ gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
+
wxSize newSize = size;
- if (newSize.x == -1) newSize.x = 100;
- if (newSize.y == -1) newSize.y = 26;
+ if (newSize.x == -1)
+ newSize.x = 100;
+ if (newSize.y == -1)
+ newSize.y = 26;
SetSize( newSize.x, newSize.y );
GtkWidget *list = GTK_COMBO(m_widget)->list;
for (int i = 0; i < n; i++)
{
- GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
+ /* don't send first event, which GTK sends aways when
+ inserting the first item */
+ m_alreadySent = TRUE;
+
+ GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
m_clientDataList.Append( (wxObject*)NULL );
m_clientObjectList.Append( (wxObject*)NULL );
gtk_container_add( GTK_CONTAINER(list), list_item );
- gtk_widget_realize( list_item );
- gtk_widget_realize( GTK_BIN(list_item)->child );
+ gtk_signal_connect( GTK_OBJECT(list_item), "select",
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
gtk_widget_show( list_item );
-
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
}
- m_parent->AddChild( this );
-
- (m_parent->m_insertCallback)( m_parent, this );
+ m_parent->DoAddChild( this );
PostCreation();
if (!value.IsNull()) SetValue( value );
- gtk_widget_realize( GTK_COMBO(m_widget)->list );
- gtk_widget_realize( GTK_COMBO(m_widget)->entry );
- gtk_widget_realize( GTK_COMBO(m_widget)->button );
+ if (style & wxCB_READONLY)
+ gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- SetBackgroundColour( parent->GetBackgroundColour() );
+ SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
wxComboBox::~wxComboBox()
{
- wxNode *node = m_clientDataList.First();
+ wxNode *node = m_clientObjectList.First();
while (node)
{
wxClientData *cd = (wxClientData*)node->Data();
if (cd) delete cd;
node = node->Next();
}
+ m_clientObjectList.Clear();
+
m_clientDataList.Clear();
}
void wxComboBox::AppendCommon( const wxString &item )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
- GtkWidget *list_item = gtk_list_item_new_with_label( item );
+ GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
+
+ gtk_container_add( GTK_CONTAINER(list), list_item );
gtk_signal_connect( GTK_OBJECT(list_item), "select",
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
- gtk_container_add( GTK_CONTAINER(list), list_item );
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_realize( list_item );
+ gtk_widget_realize( GTK_BIN(list_item)->child );
- if (m_widgetStyle) ApplyWidgetStyle();
+ if (m_widgetStyle) ApplyWidgetStyle();
+ }
gtk_widget_show( list_item );
}
void wxComboBox::SetClientData( int n, void* clientData )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return;
void* wxComboBox::GetClientData( int n )
{
- wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL;
void wxComboBox::SetClientObject( int n, wxClientData* clientData )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
if (!node) return;
wxClientData* wxComboBox::GetClientObject( int n )
{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return (wxClientData*) NULL;
void wxComboBox::Clear()
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, Number() );
void wxComboBox::Delete( int n )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
if (!child)
{
- wxFAIL_MSG("wrong index");
+ wxFAIL_MSG(_T("wrong index"));
return;
}
int wxComboBox::FindString( const wxString &item )
{
- wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, -1, _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- if (item == label->label) return count;
+ if (item == wxString(label->label,*wxConvCurrent))
+ return count;
count++;
child = child->next;
}
- wxFAIL_MSG( "wxComboBox: string not found" );
-
- return -1;
+ return wxNOT_FOUND;
}
int wxComboBox::GetSelection() const
{
- wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, -1, _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
}
}
- wxFAIL_MSG( "wxComboBox: no selection" );
+ wxFAIL_MSG( _T("wxComboBox: no selection") );
return -1;
}
wxString wxComboBox::GetString( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
+ wxString str;
GList *child = g_list_nth( GTK_LIST(list)->children, n );
if (child)
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- return label->label;
+ str = wxString(label->label,*wxConvCurrent);
+ }
+ else
+ {
+ wxFAIL_MSG( _T("wxComboBox: wrong index") );
}
- wxFAIL_MSG( "wxComboBox: wrong index" );
-
- return "";
+ return str;
}
wxString wxComboBox::GetStringSelection() const
{
- wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
if (selection)
{
GtkBin *bin = GTK_BIN( selection->data );
- wxString tmp = GTK_LABEL( bin->child )->label;
+ wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
return tmp;
}
- wxFAIL_MSG( "wxComboBox: no selection" );
+ wxFAIL_MSG( _T("wxComboBox: no selection") );
- return "";
+ return _T("");
}
int wxComboBox::Number() const
{
- wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" );
+ wxCHECK_MSG( m_widget != NULL, 0, _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
void wxComboBox::SetSelection( int n )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_select_item( GTK_LIST(list), n );
void wxComboBox::SetStringSelection( const wxString &string )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
int res = FindString( string );
if (res == -1) return;
wxString wxComboBox::GetValue() const
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
+ wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
return tmp;
}
void wxComboBox::SetValue( const wxString& value )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- wxString tmp = "";
+ wxString tmp = _T("");
if (!value.IsNull()) tmp = value;
- gtk_entry_set_text( GTK_ENTRY(entry), tmp );
+ gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );
}
void wxComboBox::Copy()
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
#else
gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
void wxComboBox::Cut()
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
#else
gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
void wxComboBox::Paste()
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
#else
gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
void wxComboBox::SetInsertionPoint( long pos )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
void wxComboBox::SetInsertionPointEnd()
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
SetInsertionPoint( -1 );
}
void wxComboBox::Replace( long from, long to, const wxString& value )
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ // FIXME: not quite sure how to do this method right in multibyte mode
GtkWidget *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;
- gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
+ gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );
}
void wxComboBox::Remove(long from, long to)
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
}
-void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
+void wxComboBox::SetSelection( long from, long to )
{
- wxFAIL_MSG( "wxComboBox::SetSelection not implemented" );
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
}
-void wxComboBox::SetEditable( bool WXUNUSED(editable) )
+void wxComboBox::SetEditable( bool editable )
{
- wxFAIL_MSG( "wxComboBox::SetEditable not implemented" );
+ GtkWidget *entry = GTK_COMBO(m_widget)->entry;
+ gtk_entry_set_editable( GTK_ENTRY(entry), editable );
+}
+
+void wxComboBox::OnChar( wxKeyEvent &event )
+{
+ if ( event.KeyCode() == WXK_RETURN )
+ {
+ wxString value = GetValue();
+
+ if ( Number() == 0 )
+ {
+ // make Enter generate "selected" event if there is only one item
+ // in the combobox - without it, it's impossible to select it at
+ // all!
+ wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
+ event.SetInt( 0 );
+ event.SetString( value );
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( event );
+ }
+ else
+ {
+ // add the item to the list if it's not there yet
+ if ( FindString(value) == wxNOT_FOUND )
+ {
+ Append(value);
+
+ // and generate the selected event for it
+ wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
+ event.SetInt( Number() - 1 );
+ event.SetString( value );
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( event );
+ }
+ //else: do nothing, this will open the listbox
+ }
+ }
+
+ event.Skip();
}
void wxComboBox::OnSize( wxSizeEvent &event )
{
- wxControl::OnSize( event );
+ event.Skip();
+
+ return;
int w = 21;
gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
{
SetWidgetStyle();
- gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
+// 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 );
(window == GTK_COMBO(m_widget)->button->window ) );
}
+#endif
projects / wxWidgets.git / blobdiff