removed redundant declaration (no real changes)

[wxWidgets.git] / src / mac / carbon / checklst.cpp

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 466c722e7b2bbff3e5222b9cdc7452ae6329201c..ddff65a4a36351ba18dc05986fab31ff6618bd93 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/src/mac/carbon/checklst.cpp
@@ -1,21 +1,16 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.cpp
+// Name:        src/mac/carbon/checklst.cpp

 // Purpose:     implementation of wxCheckListBox class
 // Author:      Stefan Csomor
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

+//
+// new DataBrowser-based version

 
 

-// ============================================================================
-// headers & declarations
-// ============================================================================
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checklst.h"
-#endif

 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 


@@ -25,213 +20,227 @@
 #include "wx/arrstr.h"
 
 #include "wx/mac/uma.h"
 #include "wx/arrstr.h"
 
 #include "wx/mac/uma.h"

-#include <Appearance.h>

 
 

-// ============================================================================
-// implementation of wxCheckListBox
-// ============================================================================
+#ifndef __DARWIN__
+#include <Appearance.h>
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 END_EVENT_TABLE()
 

-const short kTextColumnId = 1024 ;
-const short kCheckboxColumnId = 1025 ;
+const short kTextColumnId = 1024;
+const short kCheckboxColumnId = 1025;

 
 

-// new databrowser based version

 
 

-// Listbox item

 void wxCheckListBox::Init()
 {
 }
 
 void wxCheckListBox::Init()
 {
 }
 

-bool wxCheckListBox::Create(wxWindow *parent,
-                            wxWindowID id,
-                            const wxPoint &pos,
-                            const wxSize &size,
-                            const wxArrayString& choices,
-                            long style,
-                            const wxValidator& validator,
-                            const wxString &name)
+bool wxCheckListBox::Create(
+    wxWindow *parent,
+    wxWindowID id,
+    const wxPoint &pos,
+    const wxSize &size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString &name )

 {
 {

-    wxCArrayString chs(choices);
+    wxCArrayString chs( choices );

 
 

-    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
-                  style, validator, name);
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(), style, validator, name );

 }
 
 #if TARGET_API_MAC_OSX
 }
 
 #if TARGET_API_MAC_OSX

-static pascal void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, 
-    DataBrowserItemNotification message, DataBrowserItemDataRef itemData)
+static pascal void DataBrowserItemNotificationProc(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserItemNotification message,
+    DataBrowserItemDataRef itemData )

 #else
 #else

-static pascal  void DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, 
-    DataBrowserItemNotification message)
+static pascal void DataBrowserItemNotificationProc(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserItemNotification message )

 #endif
 {
 #endif
 {

-    long ref = GetControlReference( browser ) ;
-    if ( ref )
+    long ref = GetControlReference( browser );
+    if (ref != 0)

     {
     {

-        wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-        int i = itemID - 1 ;
-        if (i >= 0 && i < list->GetCount() )
+        wxCheckListBox* list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
+        int i = itemID - 1;
+        if ((i >= 0) && (i < (int)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 :
+                case kDataBrowserItemDeselected:

                     if ( list->HasMultipleSelection() )
                     if ( list->HasMultipleSelection() )

-                        trigger = true ;
-                    break ;
-                case kDataBrowserItemSelected :
-                    trigger = true ;
-                    break ;
-                case kDataBrowserItemDoubleClicked :
-                    event.SetEventType(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) ;
-                    trigger = true ;
-                    break ;
-                 default :
-                    break ;
+                        trigger = true;
+                    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() )
             }
 
             if ( trigger )
             {
                 event.SetEventObject( list );
                 if ( list->HasClientObjectData() )

-                    event.SetClientObject( list->GetClientObject(i) );
+                    event.SetClientObject( list->GetClientObject( i ) );

                 else if ( list->HasClientUntypedData() )
                 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) ; 
-            } 
+                    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 sync with event
+                // list->GetEventHandler()->ProcessEvent( event );
+            }

         }
     }
 }
 
         }
     }
 }
 

-
-static pascal OSStatus ListBoxGetSetItemData(ControlRef browser, 
-    DataBrowserItemID itemID, DataBrowserPropertyID property, 
-    DataBrowserItemDataRef itemData, Boolean changeValue)
+static pascal OSStatus ListBoxGetSetItemData(
+    ControlRef browser,
+    DataBrowserItemID itemID,
+    DataBrowserPropertyID property,
+    DataBrowserItemDataRef itemData,
+    Boolean changeValue )

 {
 {

-       OSStatus err = errDataBrowserPropertyNotSupported;
-       
-       if ( ! changeValue )
-       {       
-       switch (property)
-       {
-               
-           case kTextColumnId:
-               {       
-                   long ref = GetControlReference( browser ) ;
-                   if ( ref )
-                   {
-                       wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    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;
-           case kCheckboxColumnId :
-           {
-                   long ref = GetControlReference( browser ) ;
-                   if ( ref )
-                   {
-                       wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    int i = itemID - 1 ;
-                    if (i >= 0 && i < list->GetCount() )
-                           {
-                               verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData , list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) ) ;
-                               err = noErr ;
-                           }
-                       }
-           }
-           break ;
-               case kDataBrowserItemIsEditableProperty:
-               {       
-                   err = ::SetDataBrowserItemDataBooleanValue(itemData, true);
-               }       
-               break;
-
-               default:                
-               break;
-       }
-       }
-       else
-       {
-           switch( property )
-           {
-               case kCheckboxColumnId :
-               {
-                   long ref = GetControlReference( browser ) ;
-                   if ( ref )
-                   {
-                       wxCheckListBox* list = wxDynamicCast( (wxObject*) ref , wxCheckListBox ) ;
-                    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 ;
+    OSStatus err = errDataBrowserPropertyNotSupported;
+
+    if ( !changeValue )
+    {
+        switch (property)
+        {
+            case kTextColumnId:
+            {
+                long ref = GetControlReference( browser );
+                if (ref != 0)
+                {
+                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref, wxCheckListBox );
+                    int i = itemID - 1;
+                    if ((i >= 0) && (i < (int)list->GetCount()))
+                    {
+                        wxMacCFStringHolder cf( list->GetString( i ), list->GetFont().GetEncoding() );
+                        verify_noerr( ::SetDataBrowserItemDataText( itemData, cf ) );
+                        err = noErr;
+                    }
+                }
+            }
+            break;
+
+            case kCheckboxColumnId:
+            {
+                long ref = GetControlReference( browser );
+                if (ref != 0)
+                {
+                    wxCheckListBox* list = wxDynamicCast( (wxObject*)ref, wxCheckListBox );
+                    int i = itemID - 1;
+                    if ((i >= 0) && (i < (int)list->GetCount()))
+                    {
+                        verify_noerr( ::SetDataBrowserItemDataButtonValue( itemData, list->IsChecked( i ) ? kThemeButtonOn : kThemeButtonOff ) );
+                        err = noErr;
+                    }
+                }
+            }
+            break;
+
+            case kDataBrowserItemIsEditableProperty:
+            {
+                err = ::SetDataBrowserItemDataBooleanValue( itemData, true );
+            }
+            break;
+
+            default:
+            break;
+        }
+    }
+    else
+    {
+        switch ( property )
+        {
+            case kCheckboxColumnId:
+            {
+                long ref = GetControlReference( browser );
+                if (ref != 0)
+                {
+                    wxCheckListBox* list = wxDynamicCast( (wxObject*) ref, wxCheckListBox );
+                    int i = itemID - 1;
+                    if ((i >= 0) && (i < (int)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());
 
                         wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, list->GetId());

-                        event.SetInt(i);
-                        event.SetEventObject(list);
-                        list->GetEventHandler()->ProcessEvent(event);
-                           }
-                       }
-               
-               }
-               break ;
-               
-               default :
-               break ;
-           }
-       }
-       
-       return err;
+                        event.SetInt( i );
+                        event.SetEventObject( list );
+                        list->GetEventHandler()->ProcessEvent( event );
+                    }
+                }
+            }
+            break;
+
+            default:
+            break;
+        }
+    }
+
+    return err;

 }
 }

-bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       int n, const wxString choices[],
-                       long style,
-                       const wxValidator& validator,
-                       const wxString& name)
+
+bool wxCheckListBox::Create(
+   wxWindow *parent,
+   wxWindowID id,
+   const wxPoint& pos,
+   const wxSize& size,
+   int n,
+   const wxString choices[],
+   long style,
+   const wxValidator& validator,
+   const wxString& name )

 {
 {

-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false;

 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),

-                  _T("only one of listbox selection modes can be specified") );
-    
-    if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
+                  wxT("only one of listbox selection modes can be specified") );
+
+    if ( !wxListBoxBase::Create( parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), validator, name ) )

         return false;
 
         return false;
 

-    m_noItems = 0 ; // this will be increased by our append command
+    // this will be increased by our Append command
+    m_noItems = 0;

     m_selected = 0;
 
     m_selected = 0;
 

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );

 
 

-    m_peer = new wxMacControl(this) ;
-    verify_noerr( ::CreateDataBrowserControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, kDataBrowserListView , m_peer->GetControlRefAddr() ) );
-    
+    m_peer = new wxMacControl( this );
+    OSStatus err = ::CreateDataBrowserControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+        &bounds, kDataBrowserListView, m_peer->GetControlRefAddr() );
+    verify_noerr( err );

 
 

-    DataBrowserSelectionFlags  options = kDataBrowserDragSelect ;
+    DataBrowserSelectionFlags  options = kDataBrowserDragSelect;

     if ( style & wxLB_MULTIPLE )
     {
     if ( style & wxLB_MULTIPLE )
     {

-        options += kDataBrowserAlwaysExtendSelection + kDataBrowserCmdTogglesSelection  ;
+        options |= kDataBrowserAlwaysExtendSelection | kDataBrowserCmdTogglesSelection;

     }
     else if ( style & wxLB_EXTENDED )
     {
     }
     else if ( style & wxLB_EXTENDED )
     {


@@ -239,83 +248,88 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
     }
     else
     {
     }
     else
     {

-        options += kDataBrowserSelectOnlyOne ;
+        options |= kDataBrowserSelectOnlyOne;

     }
     }

-    verify_noerr(m_peer->SetSelectionFlags( options ) ); 

 
 

-    DataBrowserListViewColumnDesc columnDesc ;
+    err = m_peer->SetSelectionFlags( options );
+    verify_noerr( err );
+
+    DataBrowserListViewColumnDesc columnDesc;

     columnDesc.headerBtnDesc.titleOffset = 0;
     columnDesc.headerBtnDesc.titleOffset = 0;

-       columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
-               
-       columnDesc.headerBtnDesc.btnFontStyle.flags     = 
-               kControlUseFontMask | kControlUseJustMask;
-       
-       columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
-       columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
-       columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
-       columnDesc.headerBtnDesc.btnFontStyle.style = normal;
-       columnDesc.headerBtnDesc.titleString = NULL ; // CFSTR( "" );
+    columnDesc.headerBtnDesc.version = kDataBrowserListViewLatestHeaderDesc;
+
+    columnDesc.headerBtnDesc.btnFontStyle.flags =
+        kControlUseFontMask | kControlUseJustMask;
+
+    columnDesc.headerBtnDesc.btnContentInfo.contentType = kControlNoContent;
+    columnDesc.headerBtnDesc.btnFontStyle.just = teFlushDefault;
+    columnDesc.headerBtnDesc.btnFontStyle.font = kControlFontViewSystemFont;
+    columnDesc.headerBtnDesc.btnFontStyle.style = normal;
+    columnDesc.headerBtnDesc.titleString = NULL; // CFSTR( "" );

 
     // check column
 
 
     // check column
 

-       columnDesc.headerBtnDesc.minimumWidth = 30 ;
-       columnDesc.headerBtnDesc.maximumWidth = 30;
+    columnDesc.headerBtnDesc.minimumWidth = 30;
+    columnDesc.headerBtnDesc.maximumWidth = 30;

 
 

-       columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
-       columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
-       columnDesc.propertyDesc.propertyFlags = kDataBrowserPropertyIsMutable | kDataBrowserTableViewSelectionColumn |
-                                            kDataBrowserDefaultPropertyFlags;
-       verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+    columnDesc.propertyDesc.propertyID = kCheckboxColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserCheckboxType;
+    columnDesc.propertyDesc.propertyFlags =
+        kDataBrowserPropertyIsMutable
+        | kDataBrowserTableViewSelectionColumn
+        | kDataBrowserDefaultPropertyFlags;
+    err = m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn );
+    verify_noerr( err );

 
     // text column
 
 
     // text column
 

-       columnDesc.headerBtnDesc.minimumWidth = 0;
-       columnDesc.headerBtnDesc.maximumWidth = 10000;
+    columnDesc.headerBtnDesc.minimumWidth = 0;
+    columnDesc.headerBtnDesc.maximumWidth = 10000;

 
 

-       columnDesc.propertyDesc.propertyID = kTextColumnId;
-       columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
-       columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn
+    columnDesc.propertyDesc.propertyID = kTextColumnId;
+    columnDesc.propertyDesc.propertyType = kDataBrowserTextType;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserTableViewSelectionColumn

 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

-        | kDataBrowserListViewTypeSelectColumn
+     | kDataBrowserListViewTypeSelectColumn

 #endif
 #endif

-         ;
+    ;

 
 

-       
-       verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn) ) ;
+    verify_noerr( m_peer->AddListViewColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );

 
 

-    verify_noerr( m_peer->AutoSizeListViewColumns() ) ;
-    verify_noerr( m_peer->SetHasScrollBars( false , true ) ) ;
-    verify_noerr( m_peer->SetTableViewHiliteStyle( kDataBrowserTableViewFillHilite  ) ) ;
-    verify_noerr( m_peer->SetListViewHeaderBtnHeight(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 ;
+    DataBrowserCallbacks callbacks;

     callbacks.version = kDataBrowserLatestCallbacks;
     callbacks.version = kDataBrowserLatestCallbacks;

-    InitDataBrowserCallbacks(&callbacks);
-    callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP(ListBoxGetSetItemData);        
-       callbacks.u.v1.itemNotificationCallback =
+    InitDataBrowserCallbacks( &callbacks );
+    callbacks.u.v1.itemDataCallback = NewDataBrowserItemDataUPP( &ListBoxGetSetItemData );
+    callbacks.u.v1.itemNotificationCallback =

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-           (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP(DataBrowserItemNotificationProc) ;
+        (DataBrowserItemNotificationUPP) NewDataBrowserItemNotificationWithItemUPP( &DataBrowserItemNotificationProc );

 #else
 #else

-           NewDataBrowserItemNotificationUPP(DataBrowserItemNotificationProc) ;
+        NewDataBrowserItemNotificationUPP( &DataBrowserItemNotificationProc );

 #endif
 #endif

-    m_peer->SetCallbacks( &callbacks);
+    m_peer->SetCallbacks( &callbacks );

 
 #if 0
     // shouldn't be necessary anymore under 10.2
 
 #if 0
     // shouldn't be necessary anymore under 10.2

-    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
-    m_peer->SetNeedsFocusRect( true ) ;
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean)false );
+    m_peer->SetNeedsFocusRect( true );

 #endif
 
 #endif
 

-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate( pos, size );

 
 

-    for ( int i = 0 ; i < n ; i++ )
+    for ( int i = 0; i < n; i++ )

     {
     {

-        Append( choices[i] ) ;
+        Append( choices[i] );

     }
 
     }
 

-    SetBestSize(size);   // Needed because it is a wxControlWithItems
-    
-    return TRUE;
+    // Needed because it is a wxControlWithItems
+    SetBestSize( size );
+
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -324,8 +338,8 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {

-    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
-                 _T("invalid index in wxCheckListBox::IsChecked") );
+    wxCHECK_MSG( item < m_checks.GetCount(), false,
+                 wxT("invalid index in wxCheckListBox::IsChecked") );

 
     return m_checks[item] != 0;
 }
 
     return m_checks[item] != 0;
 }


@@ -333,14 +347,17 @@ bool wxCheckListBox::IsChecked(size_t item) const
 void wxCheckListBox::Check(size_t item, bool check)
 {
     wxCHECK_RET( item < m_checks.GetCount(),
 void wxCheckListBox::Check(size_t item, bool check)
 {
     wxCHECK_RET( item < m_checks.GetCount(),

-                 _T("invalid index in wxCheckListBox::Check") );
+                 wxT("invalid index in wxCheckListBox::Check") );

 
     bool isChecked = m_checks[item] != 0;
     if ( check != isChecked )
     {
         m_checks[item] = check;
 
     bool isChecked = m_checks[item] != 0;
     if ( check != isChecked )
     {
         m_checks[item] = check;

-        UInt32 id = item + 1 ;
-        verify_noerr( m_peer->UpdateItems(kDataBrowserNoItem , 1 , &id , kDataBrowserItemNoProperty , kDataBrowserItemNoProperty ) ) ;
+        UInt32 id = item + 1;
+        OSStatus err = m_peer->UpdateItems(
+            kDataBrowserNoItem, 1, &id,
+            kDataBrowserItemNoProperty, kDataBrowserItemNoProperty );
+        verify_noerr( err );

     }
 }
 
     }
 }
 


@@ -350,43 +367,42 @@ void wxCheckListBox::Check(size_t item, bool check)
 
 void wxCheckListBox::Delete(int n)
 {
 
 void wxCheckListBox::Delete(int n)
 {

-    wxCHECK_RET( n < GetCount(), _T("invalid index in wxCheckListBox::Delete") );
-
-    wxListBox::Delete(n);
+    wxCHECK_RET( (size_t)n < GetCount(), wxT("invalid index in wxCheckListBox::Delete") );

 
 

-    m_checks.RemoveAt(n);
+    wxListBox::Delete( n );
+    m_checks.RemoveAt( n );

 }
 
 int wxCheckListBox::DoAppend(const wxString& item)
 {
 }
 
 int wxCheckListBox::DoAppend(const wxString& item)
 {

-    int pos = wxListBox::DoAppend(item);
+    int pos = wxListBox::DoAppend( item );

 
     // the item is initially unchecked
 
     // the item is initially unchecked

-    m_checks.Insert(FALSE, pos);
+    m_checks.Insert( false, pos );

 
     return pos;
 }
 
 void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
 
     return pos;
 }
 
 void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
 {

-    wxListBox::DoInsertItems(items, pos);
+    wxListBox::DoInsertItems( items, pos );

 
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
 
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_checks.Insert(FALSE, pos + n);
+        m_checks.Insert( false, pos + n );

     }
 }
 
 void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     // call it first as it does DoClear()
     }
 }
 
 void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
 {
     // call it first as it does DoClear()

-    wxListBox::DoSetItems(items, clientData);
+    wxListBox::DoSetItems( items, clientData );

 
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
 
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_checks.Add(FALSE);
+        m_checks.Add( false );

     }
 }
 
     }
 }