#endif
#include "wx/combobox.h"
+#include <wx/intl.h>
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
// wxComboBox
//-----------------------------------------------------------------------------
-void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
+//-----------------------------------------------------------------------------
+// clicked
+
+static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
+ if (!combo->HasVMT()) return;
+ if (g_blockEventsOnDrag) return;
+
+ if (combo->m_alreadySent)
+ {
+ combo->m_alreadySent = FALSE;
+ return;
+ }
+
+ combo->m_alreadySent = TRUE;
+
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
event.SetInt( combo->GetSelection() );
wxString tmp( combo->GetStringSelection() );
event.SetString( WXSTRINGCAST(tmp) );
event.SetEventObject(combo);
- combo->ProcessEvent(event);
+ combo->GetEventHandler()->ProcessEvent(event);
+};
+
+//-----------------------------------------------------------------------------
+// size
+
+/*
+static gint gtk_combo_size_callback( GtkCombo *widget, GtkAllocation* alloc, wxComboBox *win )
+{
+ if (!win->HasVMT()) return FALSE;
+ if (g_blockEventsOnDrag) return FALSE;
+ if (!widget->button) return FALSE;
+
+ widget->button->allocation.x =
+ alloc->width - widget->button->allocation.width;
+
+ return FALSE;
};
+*/
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-bool wxComboBox::Create(wxWindow *parent, const wxWindowID id, const wxString& value,
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size,
- const int n, const wxString choices[],
- const long style, const wxString& name )
+ int n, const wxString choices[],
+ long style, const wxString& name )
{
+ m_alreadySent = FALSE;
m_needParent = TRUE;
PreCreation( parent, id, pos, size, style, name );
GtkWidget *list_item;
list_item = gtk_list_item_new_with_label( choices[i] );
- 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 );
+ m_clientData.Append( (wxObject*)NULL );
+
gtk_widget_show( list_item );
+
+ gtk_signal_connect( GTK_OBJECT(list_item), "select",
+ GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
};
PostCreation();
+/*
+ gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
+ GTK_SIGNAL_FUNC(gtk_combo_size_callback), (gpointer)this );
+*/
+
if (!value.IsNull()) SetValue( value );
Show( TRUE );
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+
+ m_clientData.Clear();
};
void wxComboBox::Append( const wxString &item )
+{
+ Append( item, (char*)NULL );
+};
+
+void wxComboBox::Append( const wxString &item, char *clientData )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
GtkWidget *list_item;
list_item = gtk_list_item_new_with_label( item );
- gtk_signal_connect( GTK_OBJECT(list_item), "select",
+ 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 );
gtk_widget_show( list_item );
+
+ m_clientData.Append( (wxObject*)clientData );
};
-void wxComboBox::Append( const wxString &WXUNUSED(item), char* WXUNUSED(clientData) )
-{
-};
-
-void wxComboBox::Delete( const int n )
+void wxComboBox::Delete( int n )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), n, n );
+
+ wxNode *node = m_clientData.Nth( n );
+ if (!node)
+ {
+ wxFAIL_MSG( "wxComboBox: wrong index" );
+ }
+ else
+ m_clientData.DeleteNode( node );
};
int wxComboBox::FindString( const wxString &item )
count++;
child = child->next;
};
+
+ wxFAIL_MSG( "wxComboBox: string not found" );
+
return -1;
};
-char* wxComboBox::GetClientData( const int n )
+char* wxComboBox::GetClientData( int n )
{
wxNode *node = m_clientData.Nth( n );
if (node) return (char*)node->Data();
+
+ wxFAIL_MSG( "wxComboBox: wrong index" );
+
return NULL;
};
-void wxComboBox::SetClientData( const int n, char * clientData )
+void wxComboBox::SetClientData( int n, char * clientData )
{
wxNode *node = m_clientData.Nth( n );
if (node) node->SetData( (wxObject*) clientData );
+
+ wxFAIL_MSG( "wxComboBox: wrong index" );
};
int wxComboBox::GetSelection(void) const
child = child->next;
};
};
+
+ wxFAIL_MSG( "wxComboBox: no selection" );
+
return -1;
};
-wxString wxComboBox::GetString( const int n ) const
+wxString wxComboBox::GetString( int n ) const
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
GtkLabel *label = GTK_LABEL( bin->child );
return label->label;
};
+
+ wxFAIL_MSG( "wxComboBox: wrong index" );
+
return "";
};
wxString tmp = GTK_LABEL( bin->child )->label;
return tmp;
};
+
+ wxFAIL_MSG( "wxComboBox: no selection" );
+
return "";
};
return count;
};
-void wxComboBox::SetSelection( const int n )
+void wxComboBox::SetSelection( int n )
{
GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_select_item( GTK_LIST(list), n );
};
+void wxComboBox::SetStringSelection( const wxString &string )
+{
+ int res = FindString( string );
+ if (res == -1) return;
+ SetSelection( res );
+};
+
wxString wxComboBox::GetValue(void) const
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
};
-void wxComboBox::SetInsertionPoint( const long pos )
+void wxComboBox::SetInsertionPoint( long pos )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
int tmp = (int) pos;
return (long) pos-1;
};
-void wxComboBox::Replace( const long from, const long to, const wxString& value )
+void wxComboBox::Replace( long from, long to, const wxString& value )
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
};
-void wxComboBox::Remove(const long from, const long to)
+void wxComboBox::Remove(long from, long to)
{
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
};
-void wxComboBox::SetSelection( const long WXUNUSED(from), const long WXUNUSED(to) )
+void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
{
};
-void wxComboBox::SetEditable( const bool WXUNUSED(editable) )
+void wxComboBox::SetEditable( bool WXUNUSED(editable) )
{
};
projects / wxWidgets.git / blobdiff