X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bac957422a5fb858173f7c0643dd1c0f5ae2d506..7dbf53606503c1c196419ba8b7b7a49d0e696dca:/src/gtk1/listbox.cpp?ds=sidebyside

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 20c77eec98..56089bfd2c 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -84,7 +84,7 @@ struct wxlistbox_idle_struct
     gint         m_tag;
 };
 
-static gint wxlistbox_idle_callback( gpointer gdata )
+extern "C" gint wxlistbox_idle_callback( gpointer gdata )
 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();
@@ -393,8 +393,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
-    SetBestSize( size );
-
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
@@ -411,11 +409,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         DoAppend(choices[i]);
     }
 
+    // call it after appending the strings to the listbox, otherwise it doesn't
+    // work correctly
+    SetBestSize( size );
+
     m_parent->DoAddChild( this );
 
     PostCreation();
 
-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
@@ -667,6 +669,12 @@ void wxListBox::Clear()
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, GetCount() );
+    
+    if ( GTK_LIST(m_list)->last_focus_child != NULL  )
+    {
+        // This should be NULL, I think.
+        GTK_LIST(m_list)->last_focus_child = NULL;
+    }
 
     if ( HasClientObjectData() )
     {
@@ -1038,7 +1046,7 @@ wxSize wxListBox::DoGetBestSize() const
     }
 
     // Add room for the scrollbar
-    lbWidth += wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X);
+    lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 
     // And just a bit more
     int cx, cy;