X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be1aa07f8a8194fa6c947dd39e0ac98a59498728..d109c5849ed117966311a44875c97ae3d77b44e5:/src/mac/carbon/checklst.cpp

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 5fbc1f6c44..9b2278c116 100644
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -73,46 +73,44 @@ static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrow
     if ( ref )
     {
         wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-        for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i )
-            if ( list->m_idArray[i] == (long) itemID )
+        int i = itemID - 1 ;
+        if (i >= 0 && i < list->GetCount() )
+        {
+            bool trigger = false ;
+            wxCommandEvent event(
+                wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
+            switch( message )
             {
-                bool trigger = false ;
-                wxCommandEvent event(
-                    wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
-                switch( message )
-                {
-                    case kDataBrowserItemDeselected :
-                        if ( list->HasMultipleSelection() )
-                            trigger = true ;
-                        break ;
-                    case kDataBrowserItemSelected :
+                case kDataBrowserItemDeselected :
+                    if ( list->HasMultipleSelection() )
                         trigger = true ;
-                        break ;
-                    case kDataBrowserItemDoubleClicked :
-                        event.SetEventType(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) ;
-                        trigger = true ;
-                        break ;
-                     default :
-                        break ;
-                }
-
-                if ( trigger )
-                {
-                    event.SetEventObject( list );
-                    if ( list->HasClientObjectData() )
-                        event.SetClientObject( list->GetClientObject(i) );
-                    else if ( list->HasClientUntypedData() )
-                        event.SetClientData( list->GetClientData(i) );
-                    event.SetString( list->GetString(i) );
-                    event.SetInt(i) ;
-                    event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
-                    wxPostEvent( list->GetEventHandler() , event ) ;
-                    // direct notification is not always having the listbox GetSelection() having in synch with event
-                    // list->GetEventHandler()->ProcessEvent(event) ; 
-                } 
-
-                break ;
+                    break ;
+                case kDataBrowserItemSelected :
+                    trigger = true ;
+                    break ;
+                case kDataBrowserItemDoubleClicked :
+                    event.SetEventType(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) ;
+                    trigger = true ;
+                    break ;
+                 default :
+                    break ;
             }
+
+            if ( trigger )
+            {
+                event.SetEventObject( list );
+                if ( list->HasClientObjectData() )
+                    event.SetClientObject( list->GetClientObject(i) );
+                else if ( list->HasClientUntypedData() )
+                    event.SetClientData( list->GetClientData(i) );
+                event.SetString( list->GetString(i) );
+                event.SetInt(i) ;
+                event.SetExtraLong( list->HasMultipleSelection() ? message == kDataBrowserItemSelected : TRUE );
+                wxPostEvent( list->GetEventHandler() , event ) ;
+                // direct notification is not always having the listbox GetSelection() having in synch with event
+                // list->GetEventHandler()->ProcessEvent(event) ; 
+            } 
+        }
     }
 }
 
@@ -134,14 +132,13 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
     		    if ( ref )
     		    {
     		        wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-    		        for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i )
-    		            if ( list->m_idArray[i] == (long) itemID )
-    		            {
-    		                wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
-    		                verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
-    		                err = noErr ;
-    		                break ;
-    		            }
+                    int i = itemID - 1 ;
+                    if (i >= 0 && i < list->GetCount() )
+		            {
+		                wxMacCFStringHolder cf( list->GetString(i) , list->GetFont().GetEncoding() ) ;
+		                verify_noerr( ::SetDataBrowserItemDataText( itemData , cf ) ) ;
+		                err = noErr ;
+		            }
     			}
     		}	
     		break;
@@ -151,13 +148,12 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
     		    if ( ref )
     		    {
     		        wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-    		        for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i )
-    		            if ( list->m_idArray[i] == (long) itemID )
-    		            {
-    		                verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ;
-    		                err = noErr ;
-    		                break ;
-    		            }
+                    int i = itemID - 1 ;
+                    if (i >= 0 && i < list->GetCount() )
+		            {
+		                verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ;
+		                err = noErr ;
+		            }
     			}
     	    }
     	    break ;
@@ -181,23 +177,21 @@ static pascal OSStatus ListBoxGetSetItemData(ControlRef browser,
     		    if ( ref )
     		    {
     		        wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-    		        for ( size_t i = 0 ; i < list->m_idArray.GetCount() ; ++i )
-    		            if ( list->m_idArray[i] == (long) itemID )
-    		            {
-    		                // we have to change this behind the back, since Check() would be triggering another update round
-                            bool newVal = !list->IsChecked( i ) ;
-    		                verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , newVal ? kThemeButtonOn : kThemeButtonOff ) ) ;
-    		                err = noErr ;
-    		                list->m_checks[ i ] = newVal ;
-
-                            wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
-                            event.SetInt(i);
-                            event.SetEventObject(list);
-                            list->GetEventHandler()->ProcessEvent(event);
-
-    		                break ;
-    		            }
-    			}
+                    int i = itemID - 1 ;
+                    if (i >= 0 && i < list->GetCount() )
+		            {
+		                // we have to change this behind the back, since Check() would be triggering another update round
+                        bool newVal = !list->IsChecked( i ) ;
+		                verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , newVal ? kThemeButtonOn : kThemeButtonOff ) ) ;
+		                err = noErr ;
+		                list->m_checks[ i ] = newVal ;
+
+                        wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());
+                        event.SetInt(i);
+                        event.SetEventObject(list);
+                        list->GetEventHandler()->ProcessEvent(event);
+		            }
+			}
 	        
 	        }
 	        break ;
@@ -227,14 +221,12 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 
     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;
-    m_nextId = 1 ;
-    
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    ControlRef browser ;
 
-    verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , (ControlRef *)&m_macControl ) );
-    browser = (ControlRef) m_macControl ;
+    m_peer = new wxMacControl() ;
+    verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
+    
 
     DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
     if ( style & wxLB_MULTIPLE )
@@ -249,7 +241,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     {
         options += kDataBrowserSelectOnlyOne ;
     }
-    verify_noerr(SetDataBrowserSelectionFlags  (browser, options ) ); 
+    verify_noerr(m_peer->SetSelectionFlags( options ) ); 
 
     DataBrowserListViewColumnDesc columnDesc ;
     columnDesc.headerBtnDesc.titleOffset = 0;
@@ -273,7 +265,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 	columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
 	columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
                                             kDataBrowserDefaultPropertyFlags;
-	verify_noerr(::AddDataBrowserListViewColumn(browser, &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+	verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
 
     // text column
 
@@ -289,12 +281,12 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 	  ;
 
 	
-	verify_noerr(::AddDataBrowserListViewColumn(browser, &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+	verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
 
-    verify_noerr(::AutoSizeDataBrowserListViewColumns( browser ) ) ;
-    verify_noerr(::SetDataBrowserHasScrollBars( browser , false , true ) ) ;
-    verify_noerr(::SetDataBrowserTableViewHiliteStyle( browser, kDataBrowserTableViewFillHilite  ) ) ;
-    verify_noerr(::SetDataBrowserListViewHeaderBtnHeight( browser , 0 ) ) ;
+    verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
+    verify_noerr( m_peer->SetHasScrollBars( false , true ) ) ;
+    verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite  ) ) ;
+    verify_noerr( m_peer->SetListViewHeaderBtnHeight(0 ) ) ;
 
     DataBrowserCallbacks callbacks ;
     callbacks.version = kDataBrowserLatestCallbacks;
@@ -306,7 +298,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 #else
 	    NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
 #endif
-    SetDataBrowserCallbacks(browser, &callbacks);
+    m_peer->SetCallbacks( &callbacks);
 
     MacPostControlCreate(pos,size) ;
 
@@ -337,13 +329,12 @@ void wxCheckListBox::Check(size_t item, bool check)
     wxCHECK_RET( item < m_checks.GetCount(),
                  _T("invalid index in wxCheckListBox::Check") );
 
-    // intermediate var is needed to avoid compiler warning with VC++
     bool isChecked = m_checks[item] != 0;
     if ( check != isChecked )
     {
         m_checks[item] = check;
-        UInt32 id = m_idArray[item] ;
-        verify_noerr( ::UpdateDataBrowserItems( (ControlRef) m_macControl , kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
+        UInt32 id = item + 1 ;
+        verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
     }
 }