X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0eed647daeb257f28699de879d2f4f5aeb7fb6..566b84d2ade885cc2fb4f75d63718331db8fe2df:/src/gtk/combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index e24caa2a07..7fd217fda3 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -4,16 +4,21 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "combobox.h"
 #endif
 
+
 #include "wx/combobox.h"
+
 #include <wx/intl.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -28,7 +33,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 {
     if (!combo->HasVMT()) return;
     if (g_blockEventsOnDrag) return;
-  
+
     if (combo->m_alreadySent)
     {
         combo->m_alreadySent = FALSE;
@@ -36,8 +41,8 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
     }
 
     combo->m_alreadySent = TRUE;
-  
-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
+
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId());
     event.SetInt( combo->GetSelection() );
     wxString tmp( combo->GetStringSelection() );
     event.SetString( WXSTRINGCAST(tmp) );
@@ -45,6 +50,20 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
     combo->GetEventHandler()->ProcessEvent(event);
 }
 
+//-----------------------------------------------------------------------------
+//  "changed"
+//-----------------------------------------------------------------------------
+
+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()) );
+    event.SetEventObject( combo );
+    combo->GetEventHandler()->ProcessEvent( event );
+    delete[] event.GetString();
+}
+
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
@@ -58,61 +77,66 @@ END_EVENT_TABLE()
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxPoint& pos, const wxSize& size,
                          int n, const wxString choices[],
-                         long style, const wxValidator& validator, 
-			 const wxString& name )
+                         long style, const wxValidator& validator,
+                         const wxString& name )
 {
     m_alreadySent = FALSE;
     m_needParent = TRUE;
-  
+    m_acceptsFocus = TRUE;
+
     PreCreation( parent, id, pos, size, style, name );
-  
+
     SetValidator( validator );
 
     m_widget = gtk_combo_new();
-  
+
     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;
-  
+
     for (int i = 0; i < n; i++)
     {
-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); 
-  
+        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
+
         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_widget_show( list_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 );
     }
-  
+
     m_parent->AddChild( this );
 
     (m_parent->m_insertCallback)( m_parent, this );
-  
+
     PostCreation();
 
     ConnectWidget( GTK_COMBO(m_widget)->button );
-  
+
     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 );
-  
+
+    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
+      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
-    
+
     return TRUE;
 }
 
@@ -131,142 +155,136 @@ wxComboBox::~wxComboBox()
 void wxComboBox::AppendCommon( const wxString &item )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
-    GtkWidget *list_item = gtk_list_item_new_with_label( item ); 
-  
-    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+
+    GtkWidget *list_item = gtk_list_item_new_with_label( 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 (m_widgetStyle) ApplyWidgetStyle();
-  
+
     gtk_widget_show( list_item );
 }
 
 void wxComboBox::Append( const wxString &item )
 {
-    m_clientDataList.Append( (wxObject*)NULL );
-  
+    m_clientDataList.Append( (wxObject*) NULL );
+    m_clientObjectList.Append( (wxObject*) NULL );
+
     AppendCommon( item );
 }
 
 void wxComboBox::Append( const wxString &item, void *clientData )
 {
-    if (clientData)
-        m_clientDataList.Append( (wxObject*) new wxVoidClientData( clientData ) );
-    else
-        m_clientDataList.Append( (wxObject*)NULL );
-  
+    m_clientDataList.Append( (wxObject*) clientData );
+    m_clientObjectList.Append( (wxObject*)NULL );
+
     AppendCommon( item );
 }
 
 void wxComboBox::Append( const wxString &item, wxClientData *clientData )
 {
-    m_clientDataList.Append( (wxObject*) clientData );
-  
+    m_clientDataList.Append( (wxObject*) NULL );
+    m_clientObjectList.Append( (wxObject*) clientData );
+
     AppendCommon( item );
 }
 
 void wxComboBox::SetClientData( int n, void* clientData )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;
-  
-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
-  
-    if (clientData)
-        node->SetData( (wxObject*) new wxVoidClientData(clientData) );
-    else
-        node->SetData( (wxObject*) NULL );
+
+    node->SetData( (wxObject*) clientData );
 }
 
 void* wxComboBox::GetClientData( int n )
 {
     wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
-  
+
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;
-    
-    wxVoidClientData *cd = (wxVoidClientData*) node->Data();
-    if (cd)
-        return cd->GetData();
-    else
-        return (void*) NULL;  
+
+    return node->Data();
 }
 
 void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-    
-    wxNode *node = m_clientDataList.Nth( n );
+
+    wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;
-  
+
     wxClientData *cd = (wxClientData*) node->Data();
     if (cd) delete cd;
-  
+
     node->SetData( (wxObject*) clientData );
 }
 
 wxClientData* wxComboBox::GetClientObject( int n )
 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
-  
+
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return (wxClientData*) NULL;
-    
+
     return (wxClientData*) node->Data();
 }
 
 void wxComboBox::Clear()
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-  
-    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::Delete( int n )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-  
+
     GList *child = g_list_nth( listbox->children, n );
-  
+
     if (!child)
     {
         wxFAIL_MSG("wrong index");
         return;
     }
-  
-    GList *list = g_list_append( NULL, child->data );
+
+    GList *list = g_list_append( (GList*) NULL, child->data );
     gtk_list_remove_items( listbox, list );
     g_list_free( list );
-  
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node)
-    {
-        wxFAIL_MSG( "wrong index" );
-    }
-    else
+
+    wxNode *node = m_clientObjectList.Nth( n );
+    if (node)
     {
         wxClientData *cd = (wxClientData*)node->Data();
         if (cd) delete cd;
+        m_clientObjectList.DeleteNode( node );
+    }
+
+    node = m_clientDataList.Nth( n );
+    if (node)
+    {
         m_clientDataList.DeleteNode( node );
     }
 }
@@ -274,9 +292,9 @@ void wxComboBox::Delete( int n )
 int wxComboBox::FindString( const wxString &item )
 {
     wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
+
     GList *child = GTK_LIST(list)->children;
     int count = 0;
     while (child)
@@ -287,18 +305,18 @@ int wxComboBox::FindString( const wxString &item )
         count++;
         child = child->next;
     }
-  
+
     wxFAIL_MSG( "wxComboBox: string not found" );
-  
+
     return -1;
 }
 
 int wxComboBox::GetSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
+
     GList *selection = GTK_LIST(list)->selection;
     if (selection)
     {
@@ -311,18 +329,18 @@ int wxComboBox::GetSelection() const
             child = child->next;
         }
     }
-  
+
     wxFAIL_MSG( "wxComboBox: no selection" );
-  
+
     return -1;
 }
 
 wxString wxComboBox::GetString( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
+
     GList *child = g_list_nth( GTK_LIST(list)->children, n );
     if (child)
     {
@@ -330,18 +348,18 @@ wxString wxComboBox::GetString( int n ) const
         GtkLabel *label = GTK_LABEL( bin->child );
         return label->label;
     }
-  
+
     wxFAIL_MSG( "wxComboBox: wrong index" );
-  
+
     return "";
 }
 
 wxString wxComboBox::GetStringSelection() const
 {
     wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
+
     GList *selection = GTK_LIST(list)->selection;
     if (selection)
     {
@@ -349,18 +367,18 @@ wxString wxComboBox::GetStringSelection() const
         wxString tmp = GTK_LABEL( bin->child )->label;
         return tmp;
     }
-  
+
     wxFAIL_MSG( "wxComboBox: no selection" );
-  
+
     return "";
 }
 
 int wxComboBox::Number() const
 {
     wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
-  
+
     GList *child = GTK_LIST(list)->children;
     int count = 0;
     while (child) { count++; child = child->next; }
@@ -370,7 +388,7 @@ int wxComboBox::Number() const
 void wxComboBox::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     gtk_list_select_item( GTK_LIST(list), n );
 }
@@ -378,7 +396,7 @@ void wxComboBox::SetSelection( int n )
 void wxComboBox::SetStringSelection( const wxString &string )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     int res = FindString( string );
     if (res == -1) return;
     SetSelection( res );
@@ -394,7 +412,7 @@ wxString wxComboBox::GetValue() const
 void wxComboBox::SetValue( const wxString& value )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     wxString tmp = "";
     if (!value.IsNull()) tmp = value;
@@ -404,7 +422,7 @@ void wxComboBox::SetValue( const wxString& value )
 void wxComboBox::Copy()
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
     gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
@@ -416,7 +434,7 @@ void wxComboBox::Copy()
 void wxComboBox::Cut()
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
     gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
@@ -428,7 +446,7 @@ void wxComboBox::Cut()
 void wxComboBox::Paste()
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 #if (GTK_MINOR_VERSION == 1)
     gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
@@ -440,19 +458,16 @@ void wxComboBox::Paste()
 void wxComboBox::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int tmp = (int) pos;
-    gtk_entry_set_position( GTK_ENTRY(entry), tmp );
+    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
-    SetInsertionPoint( pos-1 );
+
+    SetInsertionPoint( -1 );
 }
 
 long wxComboBox::GetInsertionPoint() const
@@ -471,7 +486,7 @@ long wxComboBox::GetLastPosition() const
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
     if (value.IsNull()) return;
@@ -482,7 +497,7 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 void wxComboBox::Remove(long from, long to)
 {
     wxCHECK_RET( m_widget != NULL, "invalid combobox" );
-  
+
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
@@ -500,10 +515,10 @@ void wxComboBox::SetEditable( bool WXUNUSED(editable) )
 void wxComboBox::OnSize( wxSizeEvent &event )
 {
     wxControl::OnSize( event );
-  
+
     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 );
 }
@@ -511,20 +526,20 @@ void wxComboBox::OnSize( wxSizeEvent &event )
 void wxComboBox::ApplyWidgetStyle()
 {
     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 );
-  
+
     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 );
-  
+
         GtkBin *bin = GTK_BIN(child->data);
         gtk_widget_set_style( bin->child, m_widgetStyle );
-        
+
         child = child->next;
     }
 }
@@ -539,3 +554,4 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
     return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
              (window == GTK_COMBO(m_widget)->button->window ) );
 }
+