X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcaadf7eaee19621c4fe283e23320f5239aa7f88..e4f1a68ad1a4c145878a7595c06859d3d59fc6e7:/src/cocoa/listbox.mm

diff --git a/src/cocoa/listbox.mm b/src/cocoa/listbox.mm
index 384e24b6b4..5e9239d031 100644
--- a/src/cocoa/listbox.mm
+++ b/src/cocoa/listbox.mm
@@ -9,9 +9,12 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/listbox.h"
-#include "wx/log.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/listbox.h"
+#endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
 #include "wx/cocoa/NSTableDataSource.h"
@@ -50,6 +53,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
 
     SetNSTableView([[NSTableView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
+    [GetNSTableView() setHeaderView: nil];
 
     // Set up the data source
     m_cocoaDataSource = [[wxCocoaNSTableDataSource alloc] init];
@@ -58,11 +62,15 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID winid,
     // Add the single column
     NSTableColumn *tableColumn = [[NSTableColumn alloc] initWithIdentifier:nil];
     [GetNSTableView() addTableColumn: tableColumn];
-//    [tableColumn release];
+    [tableColumn release];
 
+    [GetNSTableView() sizeToFit];
     // Finish
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    // NSTableView does WEIRD things with sizes.  Wrapping it in an
+    // NSScrollView seems to be the only reasonable solution.
+    CocoaCreateNSScrollView();
     SetInitialFrameRect(pos,size);
 
     return true;
@@ -73,7 +81,7 @@ wxListBox::~wxListBox()
     [GetNSTableView() setDataSource: nil];
     [m_cocoaDataSource release];
     [m_cocoaItems release];
-    DisassociateNSTableView(m_cocoaNSView);
+    DisassociateNSTableView(GetNSTableView());
 }
 
 int wxListBox::CocoaDataSource_numberOfRows()