X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be1aa07f8a8194fa6c947dd39e0ac98a59498728..143318ddbb005602b600216cca621439b771f889:/src/mac/carbon/checklst.cpp?ds=sidebyside

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 5fbc1f6c44..8ac00dd224 100644
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -231,10 +231,10 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     
 
     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 +249,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 +273,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 +289,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 +306,7 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 #else
 	    NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
 #endif
-    SetDataBrowserCallbacks(browser, &callbacks);
+    m_peer->SetCallbacks( &callbacks);
 
     MacPostControlCreate(pos,size) ;
 
@@ -337,13 +337,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 ) ) ;
+        verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
     }
 }