don't create non-existing groups in HasEntry()

[wxWidgets.git] / src / mac / classic / listbox.cpp

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 8322a7a2f2e98643b062e46273b914445aa40f4c..613d60912c216609690f5996a19ab07afe171cc2 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/mac/classic/listbox.cpp

 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,28 +9,28 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "listbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX

 
 

-#include "wx/app.h"

 #include "wx/listbox.h"
 #include "wx/listbox.h"

-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/toplevel.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"

 
 

-#include "wx/utils.h"
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/toplevel.h"
+#endif

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
     EVT_SIZE( wxListBox::OnSize )
     EVT_CHAR( wxListBox::OnChar )
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
     EVT_SIZE( wxListBox::OnSize )
     EVT_CHAR( wxListBox::OnChar )
 END_EVENT_TABLE()

-#endif

 
 #include "wx/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -76,7 +76,7 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
     list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
     if ( list == NULL )
         return ;
     list = (wxListBox*) GetControlReference( (ControlHandle) GetListRefCon(listHandle) );
     if ( list == NULL )
         return ;

-    
+

     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;
     GrafPtr savePort;
     GrafPtr grafPtr;
     RgnHandle savedClipRegion;


@@ -85,29 +85,29 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
     SetPort((**listHandle).port);
     grafPtr = (**listHandle).port ;
     // typecast our refCon
     SetPort((**listHandle).port);
     grafPtr = (**listHandle).port ;
     // typecast our refCon

-    
+

     //  Calculate the cell rect.
     //  Calculate the cell rect.

-    
+

     switch( message ) {
     case lInitMsg:
         break;
     switch( message ) {
     case lInitMsg:
         break;

-        
+

     case lCloseMsg:
         break;
     case lCloseMsg:
         break;

-        
+

     case lDrawMsg:
         {
             const wxString linetext = list->m_stringArray[cell.v] ;
     case lDrawMsg:
         {
             const wxString linetext = list->m_stringArray[cell.v] ;

-            
+

             //  Save the current clip region, and set the clip region to the area we are about
             //  to draw.
             //  Save the current clip region, and set the clip region to the area we are about
             //  to draw.

-            
+

             savedClipRegion = NewRgn();
             GetClip( savedClipRegion );
             savedClipRegion = NewRgn();
             GetClip( savedClipRegion );

-            
+

             ClipRect( drawRect );
             EraseRect( drawRect );
             ClipRect( drawRect );
             EraseRect( drawRect );

-            
+

             const wxFont& font = list->GetFont();
             if ( font.Ok() )
             {
             const wxFont& font = list->GetFont();
             if ( font.Ok() )
             {


@@ -121,50 +121,50 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
                 ::TextSize( 9  );
                 ::TextFace( 0 ) ;
             }
                 ::TextSize( 9  );
                 ::TextFace( 0 ) ;
             }

-            
+

 #if TARGET_CARBON
 #if TARGET_CARBON

-                       {
-                               Rect frame = { drawRect->top, drawRect->left + 4,
-                                   drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
-                               CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , wxMacCFStringHolder(linetext , list->GetFont().GetEncoding()) ) ;
-                               ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
-                               ::DrawThemeTextBox( mString,
-                                   kThemeCurrentPortFont,
-                                   kThemeStateActive,
-                                   false,
-                                   &frame,
-                                   teJustLeft,
-                                   nil );
-                               CFRelease( mString ) ;
-                       }
+            {
+                Rect frame = { drawRect->top, drawRect->left + 4,
+                               drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
+                CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , wxMacCFStringHolder(linetext , list->GetFont().GetEncoding()) ) ;
+                ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
+                ::DrawThemeTextBox( mString,
+                                    kThemeCurrentPortFont,
+                                    kThemeStateActive,
+                                    false,
+                                    &frame,
+                                    teJustLeft,
+                                    nil );
+                                    CFRelease( mString ) ;
+            }

 #else
 #else

-            {  
-               wxCharBuffer text = linetext.mb_str( wxConvLocal) ;
+            {
+                wxCharBuffer text = linetext.mb_str( wxConvLocal) ;

                 MoveTo(drawRect->left + 4 , drawRect->top + 10 );
                 DrawText(text, 0 , strlen(text) );
             }
                 MoveTo(drawRect->left + 4 , drawRect->top + 10 );
                 DrawText(text, 0 , strlen(text) );
             }

-#endif            
+#endif

             //  If the cell is hilited, do the hilite now. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.
             //  If the cell is hilited, do the hilite now. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.

-            
+

             if( isSelected ) {
                 savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
                 SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
                 PaintRect( drawRect );
                 SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
             }
             if( isSelected ) {
                 savedPenMode = GetPortPenMode( (CGrafPtr) grafPtr );
                 SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
                 PaintRect( drawRect );
                 SetPortPenMode( (CGrafPtr)grafPtr, savedPenMode );
             }

-            
+

             //  Restore the saved clip region.
             //  Restore the saved clip region.

-            
+

             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );
         }
         break;
     case lHiliteMsg:
             SetClip( savedClipRegion );
             DisposeRgn( savedClipRegion );
         }
         break;
     case lHiliteMsg:

-        
+

         //  Hilite or unhilite the cell. Paint the cell contents with the
         //  appropriate QuickDraw transform mode.
         //  Hilite or unhilite the cell. Paint the cell contents with the
         //  appropriate QuickDraw transform mode.

-        
+

         GetPort( &grafPtr );
         savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
         SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );
         GetPort( &grafPtr );
         savedPenMode = GetPortPenMode( (CGrafPtr)grafPtr );
         SetPortPenMode( (CGrafPtr)grafPtr, hilitetransfermode );


@@ -226,9 +226,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds ;
     Str255 title ;
 
     Rect bounds ;
     Str255 title ;

-    
+

     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;

-    
+

     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;
     if ( macListDefUPP == NULL )
     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;
     if ( macListDefUPP == NULL )


@@ -236,7 +236,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
         macListDefUPP = NewListDefUPP( wxMacListDefinition );
     }
     listDef.u.userProc = macListDefUPP ;
         macListDefUPP = NewListDefUPP( wxMacListDefinition );
     }
     listDef.u.userProc = macListDefUPP ;

-    
+

     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;


@@ -246,7 +246,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     GetFontName( kFontIDMonaco , fontName ) ;
     fontSize = 9 ;
     fontStyle = normal ;
     GetFontName( kFontIDMonaco , fontName ) ;
     fontSize = 9 ;
     fontStyle = normal ;

-#endif 
+#endif

     SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ) ) ;
 #if TARGET_CARBON
     Size asize;
     SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ) ) ;
 #if TARGET_CARBON
     Size asize;


@@ -265,8 +265,8 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     long    result ;
     wxStAppResource resload ;
 
     long    result ;
     wxStAppResource resload ;

-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
-                  (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar , 
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
+                  (style & wxLB_HSCROLL) ? kwxMacListWithVerticalAndHorizontalScrollbar : kwxMacListWithVerticalScrollbar ,

                   0 , 0, kControlListBoxProc , (long) this ) ;
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
                   0 , 0, kControlListBoxProc , (long) this ) ;
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
                sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;


@@ -310,7 +310,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     LSetDrawingMode( true , (ListHandle)m_macList ) ;
 
 
     LSetDrawingMode( true , (ListHandle)m_macList ) ;
 

-    return TRUE;
+    return true;

 }
 
 wxListBox::~wxListBox()
 }
 
 wxListBox::~wxListBox()


@@ -345,7 +345,7 @@ void wxListBox::FreeData()
 #endif // wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
 #endif // wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {

-        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+        for ( unsigned int n = 0; n < m_noItems; n++ )

         {
             delete GetClientObject(n);
         }
         {
             delete GetClientObject(n);
         }


@@ -378,30 +378,32 @@ void wxListBox::DoSetFirstItem(int N)
     MacScrollTo( N ) ;
 }
 
     MacScrollTo( N ) ;
 }
 

-void wxListBox::Delete(int N)
+void wxListBox::Delete(unsigned int n)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid index in wxListBox::Delete") );
 
 #if wxUSE_OWNER_DRAWN
                  wxT("invalid index in wxListBox::Delete") );
 
 #if wxUSE_OWNER_DRAWN

-    delete m_aItems[N];
-    m_aItems.RemoveAt(N);
+    delete m_aItems[n];
+    m_aItems.RemoveAt(n);

 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {

-        delete GetClientObject(N);
+        delete GetClientObject(n);

     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN

-    m_stringArray.RemoveAt( N ) ;
-    m_dataArray.RemoveAt( N ) ;
-    m_noItems --;
+    m_stringArray.RemoveAt(n) ;
+    m_dataArray.RemoveAt(n) ;
+    m_noItems--;

 
 

-    MacDelete( N ) ;
+    MacDelete(n) ;

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

-    int index = m_noItems ;
+    InvalidateBestSize();
+
+    unsigned int index = m_noItems ;

     m_stringArray.Add( item ) ;
     m_dataArray.Add( NULL );
     m_noItems ++;
     m_stringArray.Add( item ) ;
     m_dataArray.Add( NULL );
     m_noItems ++;


@@ -416,7 +418,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
     MacSetRedraw( false ) ;
     Clear() ;
     int n = choices.GetCount();
     MacSetRedraw( false ) ;
     Clear() ;
     int n = choices.GetCount();

-    
+

     for( int i = 0 ; i < n ; ++i )
     {
         if ( clientData )
     for( int i = 0 ; i < n ; ++i )
     {
         if ( clientData )


@@ -431,19 +433,19 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         else
             Append( choices[i] ) ;
     }
         else
             Append( choices[i] ) ;
     }

-    
+

 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // first delete old items

-        size_t ui = m_aItems.Count();
+        unsigned int ui = m_aItems.Count();

         while ( ui-- != 0 ) {
             delete m_aItems[ui];
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();
         while ( ui-- != 0 ) {
             delete m_aItems[ui];
             m_aItems[ui] = NULL;
         }
         m_aItems.Empty();

-        
+

         // then create new ones
         // then create new ones

-        for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
+        for ( ui = 0; ui < m_noItems; ui++ ) {

             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);
             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);


@@ -458,50 +460,50 @@ bool wxListBox::HasMultipleSelection() const
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 }
 
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 }
 

-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const

 {
 {

-    

     if ( s.Right(1) == wxT("*") )
     {
     if ( s.Right(1) == wxT("*") )
     {

-        wxString search = s.Left( s.Length() - 1 ) ;
-        int len = search.Length() ;
+        wxString search = s.Left( s.length() - 1 ) ;
+        int len = search.length() ;

         Str255 s1 , s2 ;
         wxMacStringToPascal( search , s2 ) ;
         Str255 s1 , s2 ;
         wxMacStringToPascal( search , s2 ) ;

-        
-        for ( int i = 0 ; i < m_noItems ; ++ i )
+
+        for ( unsigned int i = 0 ; i < m_noItems ; ++ i )

         {
         {

-               wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+            wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;

 
 

-            if ( EqualString( s1 , s2 , false , false ) )
-                return i ;
+            if ( EqualString( s1 , s2 , bCase , false ) )
+                return (int)i ;

         }
         }

-        if ( s.Left(1) == wxT("*") && s.Length() > 1 )
+        if ( s.Left(1) == wxT("*") && s.length() > 1 )

         {
             wxString st = s ;
             st.MakeLower() ;
         {
             wxString st = s ;
             st.MakeLower() ;

-            for ( int i = 0 ; i < m_noItems ; ++i )
+            for ( unsigned int i = 0 ; i < m_noItems ; ++i )

             {
             {

-                if ( GetString(i).Lower().Matches(st) )
-                    return i ;
+                if (GetString(i).Lower().Matches(st))
+                    return (int)i ;

             }
         }
             }
         }

-        
+

     }
     else
     {
         Str255 s1 , s2 ;
     }
     else
     {
         Str255 s1 , s2 ;

-        
+

         wxMacStringToPascal( s , s2 ) ;
         wxMacStringToPascal( s , s2 ) ;

-        
-        for ( int i = 0 ; i < m_noItems ; ++ i )
+
+        for ( unsigned int i = 0 ; i < m_noItems ; ++ i )

         {
         {

-               wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+            wxMacStringToPascal( m_stringArray[i] , s1 ) ;

 
 

-            if ( EqualString( s1 , s2 , false , false ) )
-                return i ;
+            if ( EqualString( s1 , s2 , bCase , false ) )
+                return (int)i ;

         }
     }
         }
     }

-    return -1;
+
+    return wxNOT_FOUND;

 }
 
 void wxListBox::Clear()
 }
 
 void wxListBox::Clear()


@@ -513,9 +515,9 @@ void wxListBox::Clear()
     MacClear() ;
 }
 
     MacClear() ;
 }
 

-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int N, bool select)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(N),

         wxT("invalid index in wxListBox::SetSelection") );
     MacSetSelection( N , select ) ;
     GetSelections( m_selectionPreImage ) ;
         wxT("invalid index in wxListBox::SetSelection") );
     MacSetSelection( N , select ) ;
     GetSelections( m_selectionPreImage ) ;


@@ -523,30 +525,30 @@ void wxListBox::SetSelection(int N, bool select)
 
 bool wxListBox::IsSelected(int N) const
 {
 
 bool wxListBox::IsSelected(int N) const
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
+    wxCHECK_MSG( IsValid(N), false,

         wxT("invalid index in wxListBox::Selected") );
         wxT("invalid index in wxListBox::Selected") );

-    
+

     return MacIsSelected( N ) ;
 }
 
     return MacIsSelected( N ) ;
 }
 

-void *wxListBox::DoGetItemClientData(int N) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
+    wxCHECK_MSG( IsValid(n), NULL,

         wxT("invalid index in wxListBox::GetClientData"));
         wxT("invalid index in wxListBox::GetClientData"));

-    
-    return (void *)m_dataArray[N];
+
+    return (void *)m_dataArray[n];

 }
 
 }
 

-wxClientData *wxListBox::DoGetItemClientObject(int N) const
+wxClientData *wxListBox::DoGetItemClientObject(unsigned int n) const

 {
 {

-    return (wxClientData *) DoGetItemClientData( N ) ;
+    return (wxClientData *) DoGetItemClientData( n ) ;

 }
 
 }
 

-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientData(unsigned int n, void *Client_data)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(n),

         wxT("invalid index in wxListBox::SetClientData") );
         wxT("invalid index in wxListBox::SetClientData") );

-    
+

 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {


@@ -555,11 +557,11 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN

-    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;
-    
-    if ( m_dataArray.GetCount() > (size_t) N )
+    wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int) n , wxT("invalid client_data array") ) ;
+
+    if ( m_dataArray.GetCount() > (size_t) n )

     {
     {

-        m_dataArray[N] = (char*) Client_data ;
+        m_dataArray[n] = (char*) Client_data ;

     }
     else
     {
     }
     else
     {


@@ -567,7 +569,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
     }
 }
 
     }
 }
 

-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
     DoSetItemClientData(n, clientData);
 }
 {
     DoSetItemClientData(n, clientData);
 }


@@ -585,32 +587,34 @@ int wxListBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-       return m_stringArray[N]  ;
+    return m_stringArray[n]  ;

 }
 
 }
 

-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)

 {
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+    wxCHECK_RET( IsValidInsert(pos),

         wxT("invalid index in wxListBox::InsertItems") );
         wxT("invalid index in wxListBox::InsertItems") );

-    
-    int nItems = items.GetCount();
-    
-    for ( int i = 0 ; i < nItems ; i++ )
+
+    InvalidateBestSize();
+
+    unsigned int nItems = items.GetCount();
+
+    for ( unsigned int i = 0 ; i < nItems ; i++ )

     {
         m_stringArray.Insert( items[i] , pos + i ) ;
         m_dataArray.Insert( NULL , pos + i ) ;
         MacInsert( pos + i , items[i] ) ;
     }
     {
         m_stringArray.Insert( items[i] , pos + i ) ;
         m_dataArray.Insert( NULL , pos + i ) ;
         MacInsert( pos + i , items[i] ) ;
     }

-    
+

     m_noItems += nItems;
 }
 
     m_noItems += nItems;
 }
 

-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)

 {
 {

-    m_stringArray[N] = s ;
-    MacSet( N , s ) ;
+    m_stringArray[n] = s;
+    MacSet(n, s);

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -618,10 +622,10 @@ wxSize wxListBox::DoGetBestSize() const
     int lbWidth = 100;  // some defaults
     int lbHeight = 110;
     int wLine;
     int lbWidth = 100;  // some defaults
     int lbHeight = 110;
     int wLine;

-    
+

     {
     {

-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
-        
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
+

         if ( m_font.Ok() )
         {
             ::TextFont( m_font.GetMacFontNum() ) ;
         if ( m_font.Ok() )
         {
             ::TextFont( m_font.GetMacFontNum() ) ;


@@ -634,9 +638,9 @@ wxSize wxListBox::DoGetBestSize() const
             ::TextSize( 9  );
             ::TextFace( 0 ) ;
         }
             ::TextSize( 9  );
             ::TextFace( 0 ) ;
         }

-        
+

         // Find the widest line
         // Find the widest line

-        for(int i = 0; i < GetCount(); i++) {
+        for(unsigned int i = 0; i < GetCount(); i++) {

             wxString str(GetString(i));
         #if wxUSE_UNICODE
             Point bounds={0,0} ;
             wxString str(GetString(i));
         #if wxUSE_UNICODE
             Point bounds={0,0} ;


@@ -649,19 +653,19 @@ wxSize wxListBox::DoGetBestSize() const
                 &baseline );
             wLine = bounds.h ;
         #else
                 &baseline );
             wLine = bounds.h ;
         #else

-            wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+            wLine = ::TextWidth( str.c_str() , 0 , str.length() ) ;

         #endif
             lbWidth = wxMax(lbWidth, wLine);
         }
         #endif
             lbWidth = wxMax(lbWidth, wLine);
         }

-        
+

         // Add room for the scrollbar
         lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
         // Add room for the scrollbar
         lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

-        
+

         // And just a bit more
         int cy = 12 ;
         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         lbWidth += cx ;
         // And just a bit more
         int cy = 12 ;
         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         lbWidth += cx ;

-        
+

         // don't make the listbox too tall (limit height to around 10 items) but don't
         // make it too small neither
         lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
         // don't make the listbox too tall (limit height to around 10 items) but don't
         // make it too small neither
         lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);


@@ -669,7 +673,7 @@ wxSize wxListBox::DoGetBestSize() const
     return wxSize(lbWidth, lbHeight);
 }
 
     return wxSize(lbWidth, lbHeight);
 }
 

-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
     return m_noItems;
 }
 {
     return m_noItems;
 }


@@ -691,10 +695,10 @@ void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:

-    wxListBoxItem(const wxString& str = "");
+    wxListBoxItem(const wxString& str = wxEmptyString);

 };
 
 };
 

-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, false)

 {
     // no bitmaps/checkmarks
     SetMarginWidth(0);
 {
     // no bitmaps/checkmarks
     SetMarginWidth(0);


@@ -723,8 +727,8 @@ list = (wxListBox*)refCon;
   ::TextFont( kFontIDMonaco ) ;
   ::TextSize( 9  );
   ::TextFace( 0 ) ;
   ::TextFont( kFontIDMonaco ) ;
   ::TextSize( 9  );
   ::TextFace( 0 ) ;

-  DrawText(text, 0 , text.Length());
-  
+  DrawText(text, 0 , text.length());
+

     }
 */
 void wxListBox::MacDelete( int N )
     }
 */
 void wxListBox::MacDelete( int N )


@@ -767,7 +771,7 @@ void wxListBox::MacSetSelection( int n , bool select )
             LSetSelect( false , cell , (ListHandle)m_macList ) ;
         }
     }
             LSetSelect( false , cell , (ListHandle)m_macList ) ;
         }
     }

-    
+

     cell.v = n ;
     LSetSelect( select , cell , (ListHandle)m_macList ) ;
     LAutoScroll( (ListHandle)m_macList ) ;
     cell.v = n ;
     LSetSelect( select , cell , (ListHandle)m_macList ) ;
     LAutoScroll( (ListHandle)m_macList ) ;


@@ -798,12 +802,12 @@ int wxListBox::MacGetSelection() const
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
     int no_sel = 0 ;
 int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
 {
     int no_sel = 0 ;

-    
+

     aSelections.Empty();
     aSelections.Empty();

-    
+

     Cell cell = { 0 , 0 } ;
     cell.v = 0 ;
     Cell cell = { 0 , 0 } ;
     cell.v = 0 ;

-    
+

     while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
     {
         aSelections.Add( cell.v ) ;
     while ( LGetSelect( true , &cell ,(ListHandle) m_macList ) )
     {
         aSelections.Add( cell.v ) ;


@@ -831,7 +835,7 @@ void wxListBox::MacScrollTo( int n )
 void wxListBox::OnSize( wxSizeEvent &event)
 {
     Point pt;
 void wxListBox::OnSize( wxSizeEvent &event)
 {
     Point pt;

-    
+

 #if TARGET_CARBON
     GetListCellSize((ListHandle)m_macList, &pt);
 #else
 #if TARGET_CARBON
     GetListCellSize((ListHandle)m_macList, &pt);
 #else


@@ -845,7 +849,7 @@ void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ,
 {
     Boolean wasDoubleClick = false ;
     long    result ;
 {
     Boolean wasDoubleClick = false ;
     long    result ;

-    
+

     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
     if ( !wasDoubleClick )
     {
     ::GetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
     if ( !wasDoubleClick )
     {


@@ -860,7 +864,6 @@ void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ,
 void wxListBox::MacSetRedraw( bool doDraw )
 {
     LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;
 void wxListBox::MacSetRedraw( bool doDraw )
 {
     LSetDrawingMode( doDraw , (ListHandle)m_macList ) ;

-    

 }
 
 void wxListBox::MacDoClick()
 }
 
 void wxListBox::MacDoClick()


@@ -868,7 +871,7 @@ void wxListBox::MacDoClick()
     wxArrayInt aSelections;
     int n ;
     size_t count = GetSelections(aSelections);
     wxArrayInt aSelections;
     int n ;
     size_t count = GetSelections(aSelections);

-    
+

     if ( count == m_selectionPreImage.GetCount() )
     {
         bool hasChanged = false ;
     if ( count == m_selectionPreImage.GetCount() )
     {
         bool hasChanged = false ;


@@ -885,12 +888,12 @@ void wxListBox::MacDoClick()
             return ;
         }
     }
             return ;
         }
     }

-    
+

     m_selectionPreImage = aSelections;
     m_selectionPreImage = aSelections;

-    
+

     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
     event.SetEventObject( this );
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
     event.SetEventObject( this );

-    
+

     if ( count > 0 )
     {
         n = aSelections[0];
     if ( count > 0 )
     {
         n = aSelections[0];


@@ -898,15 +901,15 @@ void wxListBox::MacDoClick()
             event.SetClientObject( GetClientObject(n) );
         else if ( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );
             event.SetClientObject( GetClientObject(n) );
         else if ( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );

-        event.SetString( GetString(n) );
+        event.SetString(GetString(n));

     }
     else
     {
         n = -1;
     }
     }
     else
     {
         n = -1;
     }

-    
-    event.m_commandInt = n;
-    
+
+    event.SetInt(n);
+

     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 


@@ -924,7 +927,7 @@ void wxListBox::OnChar(wxKeyEvent& event)
         wxWindow* parent = GetParent() ;
         while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
             parent = parent->GetParent() ;
         wxWindow* parent = GetParent() ;
         while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
             parent = parent->GetParent() ;

-        
+

         if ( parent && parent->GetDefaultItem() )
         {
             wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
         if ( parent && parent->GetDefaultItem() )
         {
             wxButton *def = wxDynamicCast(parent->GetDefaultItem(),


@@ -942,14 +945,14 @@ void wxListBox::OnChar(wxKeyEvent& event)
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
     {
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
     {

-       // FIXME: look in ancestors, not just parent.
+        // FIXME: look in ancestors, not just parent.

         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
         if (win)
         {
         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
         if (win)
         {

-               wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-               new_event.SetEventObject( win );
-               win->GetEventHandler()->ProcessEvent( new_event );
-       }
+            wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+            new_event.SetEventObject( win );
+            win->GetEventHandler()->ProcessEvent( new_event );
+        }

     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {
     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {


@@ -966,10 +969,10 @@ void wxListBox::OnChar(wxKeyEvent& event)
     {
         // perform the default key handling first
         wxControl::OnKeyDown( event ) ;
     {
         // perform the default key handling first
         wxControl::OnKeyDown( event ) ;

-        
+

         wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
         event.SetEventObject( this );
         wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
         event.SetEventObject( this );

-        
+

         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )
         wxArrayInt aSelections;
         int n, count = GetSelections(aSelections);
         if ( count > 0 )


@@ -979,15 +982,15 @@ void wxListBox::OnChar(wxKeyEvent& event)
                 event.SetClientObject( GetClientObject(n) );
             else if ( HasClientUntypedData() )
                 event.SetClientData( GetClientData(n) );
                 event.SetClientObject( GetClientObject(n) );
             else if ( HasClientUntypedData() )
                 event.SetClientData( GetClientData(n) );

-            event.SetString( GetString(n) );
+            event.SetString(GetString(n));

         }
         else
         {
             n = -1;
         }
         }
         else
         {
             n = -1;
         }

-        
-        event.m_commandInt = n;
-        
+
+        event.SetInt(n);
+

         GetEventHandler()->ProcessEvent(event);
     }
     else
         GetEventHandler()->ProcessEvent(event);
     }
     else


@@ -1006,18 +1009,19 @@ void wxListBox::OnChar(wxKeyEvent& event)
                 SetSelection(line) ;
                 wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
                 event.SetEventObject( this );
                 SetSelection(line) ;
                 wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
                 event.SetEventObject( this );

-                
+

                 if ( HasClientObjectData() )
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                     event.SetClientData( GetClientData(line) );
                 if ( HasClientObjectData() )
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                     event.SetClientData( GetClientData(line) );

-                event.SetString( GetString(line) );
-                
-                event.m_commandInt = line ;
-                
+                event.SetString(GetString(line));
+
+                event.SetInt(line);
+

                 GetEventHandler()->ProcessEvent(event);
             }
         }
     }
 }
 
                 GetEventHandler()->ProcessEvent(event);
             }
         }
     }
 }
 

+#endif // wxUSE_LISTBOX