opening ATSU Font info for Ulrich Telle's wxPDFContext

[wxWidgets.git] / src / osx / listbox_osx.cpp

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 43006895abb4975cefab3e92a8e726ffc78948fd..e7194b1b999116cb81cc2b8051ed42896e6b7513 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: listbox.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -108,8 +108,7 @@ wxListBox::~wxListBox()
     m_blockEvents = false;
 
     // make sure no native events get sent to a object in destruction
-    delete m_peer;
-    m_peer = NULL;
+    wxDELETE(m_peer);
 
     if ( IsSorted() )
         delete m_strings.sorted;
@@ -208,6 +207,11 @@ int wxListBox::GetSelection() const
     return GetListPeer()->ListGetSelection();
 }
 
+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+{
+    return GetListPeer()->DoListHitTest( inpoint );
+}
+
 // ----------------------------------------------------------------------------
 // display
 // ----------------------------------------------------------------------------
@@ -275,7 +279,8 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
-    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
+    static wxFont font = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+    attr.font = font;
 
     return attr;
 }