X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..4f9297b0eead20a0bfee71df18e0d8f0cbc402fb:/src/gtk/combobox.cpp

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index caf222a719..023caa971e 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -12,12 +12,14 @@
 #endif
 
 #include "wx/combobox.h"
-#include "wx/settings.h"
 
-#include <wx/intl.h>
+#if wxUSE_COMBOBOX
+
+#include "wx/settings.h"
+#include "wx/intl.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -41,7 +43,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
-    if (!combo->HasVMT()) return;
+    if (!combo->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
 
@@ -57,7 +59,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
-    
+
     combo->GetEventHandler()->ProcessEvent( event );
 }
 
@@ -69,7 +71,9 @@ 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 );
@@ -97,30 +101,30 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
-    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;
 
     for (int i = 0; i < n; i++)
     {
         /* don't send first event, which GTK sends aways when
-	   inserting the first item */
+           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 );
@@ -148,9 +152,19 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_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 );
+
     SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -159,19 +173,21 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
 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, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
@@ -219,7 +235,7 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData )
 
 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;
@@ -229,7 +245,7 @@ void wxComboBox::SetClientData( int n, void* clientData )
 
 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;
@@ -239,7 +255,7 @@ void* wxComboBox::GetClientData( int n )
 
 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;
@@ -252,7 +268,7 @@ void wxComboBox::SetClientObject( int n, wxClientData* clientData )
 
 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 );
     if (!node) return (wxClientData*) NULL;
@@ -262,7 +278,7 @@ wxClientData* wxComboBox::GetClientObject( int n )
 
 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() );
@@ -281,7 +297,7 @@ void wxComboBox::Clear()
 
 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 );
 
@@ -289,7 +305,7 @@ void wxComboBox::Delete( int n )
 
     if (!child)
     {
-        wxFAIL_MSG(_T("wrong index"));
+        wxFAIL_MSG(wxT("wrong index"));
         return;
     }
 
@@ -314,7 +330,7 @@ void wxComboBox::Delete( int n )
 
 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;
 
@@ -335,7 +351,7 @@ int wxComboBox::FindString( const wxString &item )
 
 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;
 
@@ -352,14 +368,12 @@ int wxComboBox::GetSelection() const
         }
     }
 
-    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;
 
@@ -373,7 +387,7 @@ wxString wxComboBox::GetString( int n ) const
     }
     else
     {
-        wxFAIL_MSG( _T("wxComboBox: wrong index") );
+        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
     }
 
     return str;
@@ -381,7 +395,7 @@ wxString wxComboBox::GetString( int n ) const
 
 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;
 
@@ -393,14 +407,14 @@ wxString wxComboBox::GetStringSelection() const
         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;
 
@@ -412,15 +426,19 @@ int wxComboBox::Number() const
 
 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_select_item( GTK_LIST(list), 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;
@@ -436,20 +454,20 @@ wxString wxComboBox::GetValue() const
 
 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() );
 }
 
 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)
+#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
     gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
@@ -458,10 +476,10 @@ void wxComboBox::Copy()
 
 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)
+#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
@@ -470,10 +488,10 @@ void wxComboBox::Cut()
 
 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)
+#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
 #else
     gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
@@ -482,7 +500,7 @@ void wxComboBox::Paste()
 
 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 );
@@ -490,7 +508,7 @@ void wxComboBox::SetInsertionPoint( long pos )
 
 void wxComboBox::SetInsertionPointEnd()
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     SetInsertionPoint( -1 );
 }
@@ -510,7 +528,7 @@ long wxComboBox::GetLastPosition() const
 
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
     // FIXME: not quite sure how to do this method right in multibyte mode
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
@@ -522,7 +540,7 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 
 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 );
@@ -563,6 +581,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
             if ( FindString(value) == wxNOT_FOUND )
             {
                 Append(value);
+                SetStringSelection(value);
 
                 // and generate the selected event for it
                 wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
@@ -578,17 +597,43 @@ void wxComboBox::OnChar( wxKeyEvent &event )
     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 )
 {
     event.Skip();
-    
-    return;
 
+#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()
@@ -623,3 +668,31 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
              (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, GetString(n).mbc_str());
+            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