Make wxCheckListBox call event.SetString() on all platforms, not just wxMSW. Mention...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/checklst.h b/interface/wx/checklst.h
index 40901ece48be6ac6c0730b35ae235bb13fd1934e..f1cc9e9a9a5eb0c4dc3d11d0944c18af356229ff 100644 (file)
--- a/interface/wx/checklst.h
+++ b/interface/wx/checklst.h
@@ -18,7 +18,10 @@
     @beginEventTable{wxCommandEvent}
     @event{EVT_CHECKLISTBOX(id, func)}
            Process a wxEVT_COMMAND_CHECKLISTBOX_TOGGLED event, when an item in
-           the check list box is checked or unchecked.
+           the check list box is checked or unchecked. wxCommandEvent::GetInt()
+           will contain the index of the item that was checked or unchecked.
+           wxCommandEvent::IsChecked() is not valid! Use wxCheckListBox::IsChecked()
+           instead.
     @endEventTable
 
     @library{wxcore}

diff --git a/interface/wx/event.h b/interface/wx/event.h
index 0a7e0a54ef84a5ad0ad5786e7ea48ba8ed1c2e7e..638b185ee2fa6050dfa17709d0a50633c607fd57 100644 (file)
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -1986,6 +1986,8 @@ public:
         Process a @c wxEVT_COMMAND_LISTBOX_SELECTED command, which is generated by a wxListBox control.
     @event{EVT_LISTBOX_DCLICK(id, func)}
         Process a @c wxEVT_COMMAND_LISTBOX_DOUBLECLICKED command, which is generated by a wxListBox control.
+    @event{EVT_CHECKLISTBOX(id, func)}
+        Process a @c wxEVT_COMMAND_CHECKLISTBOX_TOGGLED command, which is generated by a wxCheckListBox control.
     @event{EVT_MENU(id, func)}
         Process a @c wxEVT_COMMAND_MENU_SELECTED command, which is generated by a menu item.
     @event{EVT_MENU_RANGE(id1, id2, func)}

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index d3fe708a638bfd7a477dfecd0ffa90b100b0ae27..b61f34cf4a695a5cf072ddea6fdb1d7c5945a176 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -35,6 +35,7 @@ static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
                               listbox->GetId() );
     new_event.SetEventObject( listbox );
     new_event.SetInt( gtk_tree_path_get_indices(path)[0] );
+    new_event.SetString( listbox->GetString( new_event.GetInt() ));
     gtk_tree_path_free(path);
     listbox->Check( new_event.GetInt(), !listbox->IsChecked(new_event.GetInt()));
     listbox->HandleWindowEvent( new_event );

diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp
index b420d6d3ecef822aa5d67c6c600798e9a00df364..be06c9f289fc9ba2e7a969361bd1c3853b6f7a1f 100644 (file)
--- a/src/osx/checklst_osx.cpp
+++ b/src/osx/checklst_osx.cpp
@@ -121,6 +121,7 @@ void wxCheckListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col ,
         
         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );
+        event.SetString( GetString( n ) );
         event.SetEventObject( this );
         HandleWindowEvent( event );
     }