implement new wxBG_STYLE_XXX semantics for wxMSW too

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 3b74cc851e2a05ddfcd64275d7d11763e6c86803..fc3251897f8def6ab12df4d863e48eb42f1da27f 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -103,7 +103,10 @@ bool wxListBox::Create(
 
 wxListBox::~wxListBox()
 {
+    m_blockEvents = true;
     FreeData();
+    m_blockEvents = false;
+
     // make sure no native events get sent to a object in destruction
     delete m_peer;
     m_peer = NULL;
@@ -215,7 +218,7 @@ void wxListBox::GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxLi
         value.Set( GetString( n ) );
 }
 
-void wxListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value )
+void wxListBox::SetValueCallback( unsigned int WXUNUSED(n), wxListWidgetColumn* WXUNUSED(col) , wxListWidgetCellValue& WXUNUSED(value) )
 {
 }
 
@@ -272,11 +275,7 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
-#if wxOSX_USE_ATSU_TEXT
-    attr.font.MacCreateFromThemeFont(kThemeViewsFont);
-#else
-    attr.font.MacCreateFromUIFont(kCTFontViewsFontType);
-#endif
+    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
 
     return attr;
 }