Merge SOC2009_FSWATCHER branch into trunk.

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index e138470caee91944ed8a8da4bc066ee755c9e393..25a06fd79ede7a1e1eb6cf9167a403e16338a73d 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -88,7 +88,7 @@ bool wxListBox::Create(
         m_strings.unsorted = new wxArrayString;
 
     m_peer = wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() );
-    
+
     MacPostControlCreate( pos, size );
 
     m_textColumn = GetListPeer()->InsertTextColumn(0,wxEmptyString);
@@ -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;
@@ -152,7 +155,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;
-    
+
     UpdateOldSelections();
 }
 
@@ -161,7 +164,7 @@ void wxListBox::DoClear()
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;
-    
+
     UpdateOldSelections();
 }
 
@@ -175,14 +178,14 @@ void wxListBox::DoSetSelection(int n, bool select)
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;
-    
+
     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );
-        
+
     m_blockEvents = false;
-    
+
     UpdateOldSelections();
 }
 
@@ -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;
 }
@@ -360,7 +359,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
 
 void wxListBox::SetString(unsigned int n, const wxString& s)
 {
-    wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
+    wxCHECK_RET( !IsSorted(), wxT("can't set string in sorted listbox") );
 
     if ( IsSorted() )
         (*m_strings.sorted)[n] = s;
@@ -370,4 +369,39 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
     GetListPeer()->UpdateLine(n);
 }
 
+//
+// common event handling
+//
+
+void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
+{
+    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED :
+        wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
+    event.SetEventObject( this );
+    if ( HasClientObjectData() )
+        event.SetClientObject( GetClientObject(n) );
+    else if ( HasClientUntypedData() )
+        event.SetClientData( GetClientData(n) );
+    event.SetString( GetString(n) );
+    event.SetInt( n );
+    event.SetExtraLong( 1 );
+    HandleWindowEvent(event);
+}
+
+//
+// common list cell value operations
+//
+
+void wxListWidgetCellValue::Check( bool check )
+{
+    Set( check ? 1 : 0 );
+}
+
+bool wxListWidgetCellValue::IsChecked() const
+{
+    return GetIntValue() != 0;
+}
+
+
+
 #endif // wxUSE_LISTBOX