copy item text for app menu items from wx menus

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

diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp
index be06c9f289fc9ba2e7a969361bd1c3853b6f7a1f..16e0993bc4ea5d0fe434df61b60c17828a996694 100644 (file)
--- a/src/osx/checklst_osx.cpp
+++ b/src/osx/checklst_osx.cpp
@@ -24,11 +24,9 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-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 +83,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 +91,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 +106,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,8 +115,8 @@ 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 );
         event.SetString( GetString( n ) );
         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );
         event.SetString( GetString( n ) );