fixed infinite loop in wxCursor(wxImage) ctor

[wxWidgets.git] / src / gtk1 / combobox.cpp

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 492a1d6a02c91758071074a3d92380e03ee6c3aa..55cbde698363aeec9f4c5ec70f13234b958376e5 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -20,8 +20,7 @@
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -57,8 +56,18 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 
     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 );
 
@@ -102,6 +111,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
+    m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
@@ -121,6 +131,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
+    gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
+
     for (int i = 0; i < n; i++)
     {
         /* don't send first event, which GTK sends aways when
@@ -141,6 +153,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     }
 
     m_parent->DoAddChild( this );
+    
+    m_focusWidget = GTK_COMBO(m_widget)->entry;
 
     PostCreation();
 
@@ -163,9 +177,15 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     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::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );
@@ -272,7 +292,7 @@ wxClientData* wxComboBox::GetClientObject( int n )
 {
     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();
@@ -433,7 +453,9 @@ void wxComboBox::SetSelection( int n )
     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();
 }
@@ -469,11 +491,7 @@ void wxComboBox::Copy()
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (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()
@@ -481,11 +499,7 @@ void wxComboBox::Cut()
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (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()
@@ -493,11 +507,7 @@ void wxComboBox::Paste()
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (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 )
@@ -517,8 +527,7 @@ void wxComboBox::SetInsertionPointEnd()
 
 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
@@ -592,10 +601,29 @@ void wxComboBox::OnChar( wxKeyEvent &event )
                 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();
 }