Added VC++ project files for remaining Gizmo samples

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 023caa971e8052f0b83ef9eb2d11fa43b4f24e61..de35777f0b8bc2682090eac4e64d887837df7366 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -18,6 +18,8 @@
 #include "wx/settings.h"
 #include "wx/intl.h"
 
 #include "wx/settings.h"
 #include "wx/intl.h"
 

+#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+

 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 


@@ -55,8 +57,18 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 
     combo->m_alreadySent = TRUE;
 
 
     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() );
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );

-    event.SetInt( combo->GetSelection() );
+    event.SetInt( curSelection );

     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
 
     event.SetString( combo->GetStringSelection() );
     event.SetEventObject( combo );
 


@@ -100,6 +112,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     m_alreadySent = FALSE;
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
     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 ))
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))


@@ -119,6 +132,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
 
 
     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
     for (int i = 0; i < n; i++)
     {
         /* don't send first event, which GTK sends aways when


@@ -139,6 +154,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     }
 
     m_parent->DoAddChild( this );
     }
 
     m_parent->DoAddChild( this );

+    
+    m_focusWidget = GTK_COMBO(m_widget)->entry;

 
     PostCreation();
 
 
     PostCreation();
 


@@ -161,9 +178,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))
     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 );
         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 );
     SetForegroundColour( parent->GetForegroundColour() );
 
     Show( TRUE );


@@ -270,7 +293,7 @@ wxClientData* wxComboBox::GetClientObject( int n )
 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("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();
     if (!node) return (wxClientData*) NULL;
 
     return (wxClientData*) node->Data();


@@ -431,7 +454,9 @@ void wxComboBox::SetSelection( int n )
     DisableEvents();
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     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 );
     gtk_list_select_item( GTK_LIST(list), n );

+    m_prevSelection = n;

 
     EnableEvents();
 }
 
     EnableEvents();
 }


@@ -590,7 +615,26 @@ void wxComboBox::OnChar( wxKeyEvent &event )
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }
                 event.SetEventObject( this );
                 GetEventHandler()->ProcessEvent( event );
             }

-            //else: do nothing, this will open the listbox
+            else
+            {
+                // 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;
+                    }
+                }
+            }

         }
     }
 
         }
     }