don't use -q option with egrep, Solaris doesn't have it (bug 517145)

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 26e78469decc7383c5e9610d9ffca09023ca8002..326381bcb41edc77bce20cb0dac4475a4dc9d572 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -154,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();
 


@@ -176,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 );


@@ -285,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();