#include "wx/combobox.h"
-#include <wx/intl.h>
+#if wxUSE_COMBOBOX
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/settings.h"
+#include "wx/intl.h"
+
+#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
+
+#include "wx/gtk/private.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
//-----------------------------------------------------------------------------
// data
static void
gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
- if (!combo->HasVMT())
- return;
+ if (g_isIdle) wxapp_install_idle_handler();
- if (g_blockEventsOnDrag)
- return;
+ if (!combo->m_hasVMT) return;
+
+ if (g_blockEventsOnDrag) return;
if (combo->m_alreadySent)
{
combo->m_alreadySent = TRUE;
+ int curSelection = combo->GetSelection();
+
+ if (combo->m_prevSelection != curSelection)
+ {
+ GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
+ gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
+ }
+
+ combo->m_prevSelection = curSelection;
+
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
- event.SetInt( combo->GetSelection() );
+ event.SetInt( curSelection );
event.SetString( combo->GetStringSelection() );
event.SetEventObject( combo );
-
+
combo->GetEventHandler()->ProcessEvent( event );
}
static void
gtk_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() );
event.SetString( combo->GetValue() );
event.SetEventObject( combo );
m_alreadySent = FALSE;
m_needParent = TRUE;
m_acceptsFocus = TRUE;
+ m_prevSelection = 0;
- PreCreation( parent, id, pos, size, style, name );
-
- SetValidator( validator );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxComboBox creation failed") );
+ return FALSE;
+ }
m_widget = gtk_combo_new();
// make it more useable
- gtk_combo_set_use_arrows_always(GTK_COMBO(m_widget), TRUE);
+ gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
+
+ // and case-sensitive
+ gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
- wxSize newSize = size;
- 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;
+#ifndef __WXGTK20__
+ // gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+#endif
+
for (int i = 0; i < n; i++)
{
- GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
+ /* 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( 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 );
-
gtk_signal_connect( GTK_OBJECT(list_item), "select",
- GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
- }
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
- m_parent->AddChild( this );
+ gtk_widget_show( list_item );
+ }
- (m_parent->m_insertCallback)( m_parent, this );
+ m_parent->DoAddChild( this );
+
+ m_focusWidget = GTK_COMBO(m_widget)->entry;
PostCreation();
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- SetBackgroundColour( parent->GetBackgroundColour() );
+ 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() );
- SetFont( parent->GetFont() );
Show( TRUE );
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::SetFocus()
+{
+ if ( m_hasFocus )
+ {
+ // don't do anything if we already have focus
+ return;
+ }
+
+ gtk_widget_grab_focus( m_focusWidget );
+}
+
void wxComboBox::AppendCommon( const wxString &item )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
- GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
+ GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
gtk_container_add( GTK_CONTAINER(list), list_item );
void wxComboBox::SetClientData( int n, void* clientData )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return;
void* wxComboBox::GetClientData( int n )
{
- wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL;
void wxComboBox::SetClientObject( int n, wxClientData* clientData )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
if (!node) return;
wxClientData* wxComboBox::GetClientObject( int n )
{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
- wxNode *node = m_clientDataList.Nth( n );
+ wxNode *node = m_clientObjectList.Nth( n );
if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->Data();
void wxComboBox::Clear()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("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, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
if (!child)
{
- wxFAIL_MSG(_T("wrong index"));
+ wxFAIL_MSG(wxT("wrong index"));
return;
}
int wxComboBox::FindString( const wxString &item )
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("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)
+#ifdef __WXGTK20__
+ wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+ wxString str( label->label );
+#endif
+ if (item == str)
return count;
+
count++;
child = child->next;
}
int wxComboBox::GetSelection() const
{
- wxCHECK_MSG( m_widget != NULL, -1, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
}
}
- wxFAIL_MSG( _T("wxComboBox: no selection") );
-
return -1;
}
wxString wxComboBox::GetString( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
- str = label->label;
+#ifdef __WXGTK20__
+ str = wxGTK_CONV_BACK( gtk_label_get_text(label) );
+#else
+ str = wxString( label->label );
+#endif
}
else
{
- wxFAIL_MSG( _T("wxComboBox: wrong index") );
+ wxFAIL_MSG( wxT("wxComboBox: wrong index") );
}
return str;
wxString wxComboBox::GetStringSelection() const
{
- wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
if (selection)
{
GtkBin *bin = GTK_BIN( selection->data );
- wxString tmp = GTK_LABEL( bin->child )->label;
+ GtkLabel *label = GTK_LABEL( bin->child );
+#ifdef __WXGTK20__
+ wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
+#else
+ wxString tmp( label->label );
+#endif
return tmp;
}
- wxFAIL_MSG( _T("wxComboBox: no selection") );
+ wxFAIL_MSG( wxT("wxComboBox: no selection") );
- return _T("");
+ return wxT("");
}
int wxComboBox::Number() const
{
- wxCHECK_MSG( m_widget != NULL, 0, _T("invalid combobox") );
+ wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
GtkWidget *list = GTK_COMBO(m_widget)->list;
void wxComboBox::SetSelection( int n )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+
+ DisableEvents();
GtkWidget *list = GTK_COMBO(m_widget)->list;
+ gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );
gtk_list_select_item( GTK_LIST(list), n );
+ m_prevSelection = n;
+
+ EnableEvents();
}
void wxComboBox::SetStringSelection( const wxString &string )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("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) );
+ GtkEntry *entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
+ wxString tmp( wxGTK_CONV_BACK( gtk_entry_get_text( entry ) ) );
+
+#if 0
+ for (int i = 0; i < wxStrlen(tmp.c_str()) +1; i++)
+ {
+ wxChar c = tmp[i];
+ printf( "%d ", (int) (c) );
+ }
+ printf( "\n" );
+#endif
+
return tmp;
}
void wxComboBox::SetValue( const wxString& value )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- wxString tmp = _T("");
+ wxString tmp = wxT("");
if (!value.IsNull()) tmp = value;
- gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );
+ gtk_entry_set_text( GTK_ENTRY(entry), wxGTK_CONV( tmp ) );
}
void wxComboBox::Copy()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
-#else
- gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+ gtk_editable_copy_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
}
void wxComboBox::Cut()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
-#else
- gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+ gtk_editable_cut_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG );
}
void wxComboBox::Paste()
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
- gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
+ gtk_editable_paste_clipboard( GTK_EDITABLE(entry) DUMMY_CLIPBOARD_ARG);
}
void wxComboBox::SetInsertionPoint( long pos )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("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, _T("invalid combobox") );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
SetInsertionPoint( -1 );
}
long wxComboBox::GetInsertionPoint() const
{
- GtkWidget *entry = GTK_COMBO(m_widget)->entry;
- return (long) GTK_EDITABLE(entry)->current_pos;
+ return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
}
long wxComboBox::GetLastPosition() const
void wxComboBox::Replace( long from, long to, const wxString& value )
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
- // FIXME: not quite sure how to do this method right in multibyte mode
+ 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 );
if (value.IsNull()) return;
gint pos = (gint)to;
- gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );
+
+#if wxUSE_UNICODE
+ 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 );
+#endif
}
void wxComboBox::Remove(long from, long to)
{
- wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+ 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 );
if ( FindString(value) == wxNOT_FOUND )
{
Append(value);
+ SetStringSelection(value);
// and generate the selected event for it
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
}
- //else: do nothing, this will open the listbox
+
+ // This will invoke the dialog default action, such
+ // as the clicking the default button.
+
+ wxWindow *top_frame = m_parent;
+ while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
+ top_frame = top_frame->GetParent();
+
+ if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
+ {
+ GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+ if (window->default_widget)
+ {
+ gtk_widget_activate (window->default_widget);
+ return;
+ }
+ }
+
+ return;
}
}
-
+
event.Skip();
}
+void wxComboBox::DisableEvents()
+{
+ GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+ GList *child = list->children;
+ while (child)
+ {
+ gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+
+ child = child->next;
+ }
+}
+
+void wxComboBox::EnableEvents()
+{
+ GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+ GList *child = list->children;
+ while (child)
+ {
+ gtk_signal_connect( GTK_OBJECT(child->data), "select",
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
+
+ child = child->next;
+ }
+}
+
void wxComboBox::OnSize( wxSizeEvent &event )
{
- wxControl::OnSize( event );
+ event.Skip();
+#if 0
int w = 21;
gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
+#endif // 0
}
void wxComboBox::ApplyWidgetStyle()
{
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 ) );
}
+wxSize wxComboBox::DoGetBestSize() const
+{
+ wxSize ret( wxControl::DoGetBestSize() );
+
+ // we know better our horizontal extent: it depends on the longest string
+ // in the combobox
+ ret.x = 0;
+ if ( m_widget )
+ {
+ GdkFont *font = m_font.GetInternalFont();
+
+ wxCoord width;
+ size_t count = Number();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ width = (wxCoord)gdk_string_width(font, wxGTK_CONV( GetString(n) ) );
+ if ( width > ret.x )
+ ret.x = width;
+ }
+ }
+
+ // empty combobox should have some reasonable default size too
+ if ( ret.x < 100 )
+ ret.x = 100;
+ return ret;
+}
+
+#endif
projects / wxWidgets.git / blobdiff