Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp
index 574d9ecf83d4108c66390044a37c0886f24a8373..fd1d66d478070216d797db2cbc01725779d8bca7 100644 (file)
--- a/src/osx/checklst_osx.cpp
+++ b/src/osx/checklst_osx.cpp
@@ -28,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()

- 
+

 void wxCheckListBox::Init()
 {
 }
 void wxCheckListBox::Init()
 {
 }


@@ -85,7 +85,7 @@ bool wxCheckListBox::Create(
 bool wxCheckListBox::IsChecked(unsigned int n) const
 {
     wxCHECK_MSG( IsValid(n), false,
 bool wxCheckListBox::IsChecked(unsigned int n) const
 {
     wxCHECK_MSG( IsValid(n), false,

-                 _T("invalid index in wxCheckListBox::IsChecked") );
+                 wxT("invalid index in wxCheckListBox::IsChecked") );

 
     return m_checks[n] != 0;
 }
 
     return m_checks[n] != 0;
 }


@@ -93,7 +93,7 @@ bool wxCheckListBox::IsChecked(unsigned int n) const
 void wxCheckListBox::Check(unsigned int n, bool check)
 {
     wxCHECK_RET( IsValid(n),
 void wxCheckListBox::Check(unsigned int n, bool check)
 {
     wxCHECK_RET( IsValid(n),

-                 _T("invalid index in wxCheckListBox::Check") );
+                 wxT("invalid index in wxCheckListBox::Check") );

 
     // intermediate var is needed to avoid compiler warning with VC++
     bool isChecked = m_checks[n] != 0;
 
     // intermediate var is needed to avoid compiler warning with VC++
     bool isChecked = m_checks[n] != 0;


@@ -108,7 +108,7 @@ void wxCheckListBox::Check(unsigned int n, bool check)
 void wxCheckListBox::GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value )
 {
     if ( col == m_checkColumn )
 void wxCheckListBox::GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value )
 {
     if ( col == m_checkColumn )

-        value.Set( IsChecked( n ) );
+        value.Check( IsChecked( n ) );

     else
         wxListBox::GetValueCallback( n, col, value );
 }
     else
         wxListBox::GetValueCallback( n, col, value );
 }


@@ -117,10 +117,11 @@ void wxCheckListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col ,
 {
     if ( col == m_checkColumn )
     {
 {
     if ( col == m_checkColumn )
     {

-        Check( n, value.GetIntValue() );
-        
+        Check( n, value.IsChecked() );
+

         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );
         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );

+        event.SetString( GetString( n ) );

         event.SetEventObject( this );
         HandleWindowEvent( event );
     }
         event.SetEventObject( this );
         HandleWindowEvent( event );
     }


@@ -134,6 +135,8 @@ void wxCheckListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col ,
 
 void wxCheckListBox::OnItemInserted(unsigned int pos)
 {
 
 void wxCheckListBox::OnItemInserted(unsigned int pos)
 {

+    wxListBox::OnItemInserted(pos);
+

     m_checks.Insert(false, pos );
 }
 
     m_checks.Insert(false, pos );
 }
 


@@ -146,6 +149,8 @@ void wxCheckListBox::DoDeleteOneItem(unsigned int n)
 
 void wxCheckListBox::DoClear()
 {
 
 void wxCheckListBox::DoClear()
 {

+    wxListBox::DoClear();
+

     m_checks.Empty();
 }
 
     m_checks.Empty();
 }