Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

insert was not correctly implemented

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-09-25 16:43:31 +00:00
parent 8e0f22c082
commit 683e36bccc
1 changed files with 63 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/mac/carbon/checklst.cpp
View File

@@ -73,8 +73,8 @@ static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
if ( ref ) if ( ref )
{ {
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ; wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) size_t i = itemID - 1 ;
if ( list->m_idArray[i] == (long) itemID ) if (i >= 0 && i < list->GetCount() )
{ {
bool trigger = false ; bool trigger = false ;
wxCommandEvent event( wxCommandEvent event(
@@ -110,8 +110,6 @@ static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
// direct notification is not always having the listbox GetSelection() having in synch with event // direct notification is not always having the listbox GetSelection() having in synch with event
// list->GetEventHandler()->ProcessEvent(event) ; // list->GetEventHandler()->ProcessEvent(event) ;
} }
break ;
} }
} }
} }
@@ -134,13 +132,12 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
if ( ref ) if ( ref )
{ {
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ; wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) size_t i = itemID - 1 ;
if ( list->m_idArray[i] == (long) itemID ) if (i >= 0 && i < list->GetCount() )
{ {
wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ; wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ; verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
err = noErr ; err = noErr ;
break ;
} }
} }
} }
@@ -151,12 +148,11 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
if ( ref ) if ( ref )
{ {
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ; wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) size_t i = itemID - 1 ;
if ( list->m_idArray[i] == (long) itemID ) if (i >= 0 && i < list->GetCount() )
{ {
verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ; verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ;
err = noErr ; err = noErr ;
break ;
} }
} }
} }
@@ -181,8 +177,8 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
if ( ref ) if ( ref )
{ {
wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ; wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i ) size_t i = itemID - 1 ;
if ( list->m_idArray[i] == (long) itemID ) if (i >= 0 && i < list->GetCount() )
{ {
// we have to change this behind the back, since Check() would be triggering another update round // we have to change this behind the back, since Check() would be triggering another update round
bool newVal = !list->IsChecked( i ) ; bool newVal = !list->IsChecked( i ) ;
@@ -194,8 +190,6 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
event.SetInt(i); event.SetInt(i);
event.SetEventObject(list); event.SetEventObject(list);
list->GetEventHandler()->ProcessEvent(event); list->GetEventHandler()->ProcessEvent(event);
break ;
} }
} }
@@ -227,8 +221,6 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
m_noItems = 0 ; // this will be increased by our append command m_noItems = 0 ; // this will be increased by our append command
m_selected = 0; m_selected = 0;
m_nextId = 1 ;
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
@@ -341,7 +333,7 @@ void wxCheckListBox::Check(size_t item, bool check)
if ( check != isChecked ) if ( check != isChecked )
{ {
m_checks[item] = check; m_checks[item] = check;
UInt32 id = m_idArray[item] ; UInt32 id = item + 1 ;
verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ; verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
} }
} }