Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 56e8db0c7d1d24c86417de62b7998314be735741..86679dd65507c0f7a25acabee058a87fb94774d9 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -374,7 +374,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 

-    SetSizeOrDefault( size );
+    SetBestSize( size );

 
     if ( style & wxLB_SORT )
     {
 
     if ( style & wxLB_SORT )
     {


@@ -682,7 +682,7 @@ void wxListBox::Delete( int n )
     wxNode *node = m_clientList.Nth( n );
     if ( node )
     {
     wxNode *node = m_clientList.Nth( n );
     if ( node )
     {

-        if ( m_clientDataItemsType == ClientData_Object )
+        if ( m_clientDataItemsType == wxClientData_Object )

         {
             wxClientData *cd = (wxClientData*)node->Data();
             delete cd;
         {
             wxClientData *cd = (wxClientData*)node->Data();
             delete cd;