use wxLocaltime_r() instead of localtime(): this is safer and localtime() isn't avail...

[wxWidgets.git] / src / mac / carbon / listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index faf519d08a6de13ebde56cabe5e8f27fbc352bf3..1a50bd9dc7701a31f60924664e83f7475997a00b 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -16,15 +16,12 @@
 #include "wx/listbox.h"
 
 #ifndef WX_PRECOMP
 #include "wx/listbox.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/dynarray.h"

     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-    #include "wx/app.h"

     #include "wx/utils.h"
     #include "wx/utils.h"

-    #include "wx/button.h"

     #include "wx/settings.h"
     #include "wx/arrstr.h"
     #include "wx/settings.h"
     #include "wx/arrstr.h"

-    #include "wx/toplevel.h"
+    #include "wx/dcclient.h"

 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)


@@ -33,7 +30,6 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"
 END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"

-#include "wx/dynarray.h"

 
 // ============================================================================
 // list box control implementation
 
 // ============================================================================
 // list box control implementation


@@ -93,7 +89,7 @@ bool wxListBox::Create(
     InsertItems( n, choices, 0 );
 
    // Needed because it is a wxControlWithItems
     InsertItems( n, choices, 0 );
 
    // Needed because it is a wxControlWithItems

-    SetBestSize( size );
+    SetInitialSize( size );

 
     return true;
 }
 
     return true;
 }