Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 3b74cc851e2a05ddfcd64275d7d11763e6c86803..f89fd924d03566b12e81124839b617dae0a2f53f 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() );
         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);
     MacPostControlCreate( pos, size );
 
     m_textColumn = GetListPeer()->InsertTextColumn(0,wxEmptyString);


@@ -103,10 +103,12 @@ bool wxListBox::Create(
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

+    m_blockEvents = true;

     FreeData();
     FreeData();

+    m_blockEvents = false;
+

     // make sure no native events get sent to a object in destruction
     // 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;
 
     if ( IsSorted() )
         delete m_strings.sorted;


@@ -152,7 +154,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -161,7 +163,7 @@ void wxListBox::DoClear()
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -175,14 +177,14 @@ void wxListBox::DoSetSelection(int n, bool select)
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;

-    
+

     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );
     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );

-        
+

     m_blockEvents = false;
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -205,6 +207,11 @@ int wxListBox::GetSelection() const
     return GetListPeer()->ListGetSelection();
 }
 
     return GetListPeer()->ListGetSelection();
 }
 

+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+{
+    return GetListPeer()->DoListHitTest( inpoint );
+}
+

 // ----------------------------------------------------------------------------
 // display
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display
 // ----------------------------------------------------------------------------


@@ -215,14 +222,14 @@ void wxListBox::GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxLi
         value.Set( GetString( n ) );
 }
 
         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) )

 {
 }
 
 wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults
 {
 }
 
 wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults

-    int lbHeight = 110;
+    int lbHeight;

     int wLine;
 
     {
     int wLine;
 
     {


@@ -272,11 +279,8 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
 
     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
+    static wxFont font = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+    attr.font = font;

 
     return attr;
 }
 
     return attr;
 }


@@ -360,7 +364,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
 
 void wxListBox::SetString(unsigned int n, const wxString& s)
 {
 
 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;
 
     if ( IsSorted() )
         (*m_strings.sorted)[n] = s;


@@ -376,7 +380,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {

-    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED : 
+    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED :

         wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )
         wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )


@@ -389,4 +393,20 @@ void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
     HandleWindowEvent(event);
 }
 
     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
 #endif // wxUSE_LISTBOX