Back to previous call with -1 replacement.

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

diff --git a/src/mac/classic/listbox.cpp b/src/mac/classic/listbox.cpp
index 125b84b6828eded13a6be9df3c7d3a692f9f0fff..d0de7211908e92d497b629330f176f01ea67a927 100644 (file)
--- a/src/mac/classic/listbox.cpp
+++ b/src/mac/classic/listbox.cpp
@@ -9,15 +9,21 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#include "wx/app.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+

 #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

 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 


@@ -304,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()


@@ -339,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);
         }


@@ -372,32 +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)
 {
     InvalidateBestSize();
 
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
     InvalidateBestSize();
 

-    int index = m_noItems ;
+    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 ++;


@@ -431,7 +437,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
 #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;
         while ( ui-- != 0 ) {
             delete m_aItems[ui];
             m_aItems[ui] = NULL;


@@ -439,7 +445,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         m_aItems.Empty();
 
         // then create new ones
         m_aItems.Empty();
 
         // 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,26 +464,26 @@ 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 ) ;
 
             if ( EqualString( s1 , s2 , bCase , false ) )
         {
             wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
 
             if ( EqualString( s1 , s2 , bCase , false ) )

-                return i ;
+                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 ;

             }
         }
 
             }
         }
 


@@ -488,12 +494,12 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
 
         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 ) ;
 
             if ( EqualString( s1 , s2 , bCase , false ) )
         {
             wxMacStringToPascal( m_stringArray[i] , s1 ) ;
 
             if ( EqualString( s1 , s2 , bCase , false ) )

-                return i ;
+                return (int)i ;

         }
     }
 
         }
     }
 


@@ -511,7 +517,7 @@ void wxListBox::Clear()
 
 void wxListBox::DoSetSelection(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 ) ;


@@ -519,28 +525,28 @@ void wxListBox::DoSetSelection(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") );
 
     return MacIsSelected( N ) ;
 }
 
         wxT("invalid index in wxListBox::Selected") );
 
     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") );
 
 #if wxUSE_OWNER_DRAWN
         wxT("invalid index in wxListBox::SetClientData") );
 
 #if wxUSE_OWNER_DRAWN


@@ -551,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") ) ;
+    wxASSERT_MSG( m_dataArray.GetCount() >= (unsigned int) n , wxT("invalid client_data array") ) ;

 
 

-    if ( m_dataArray.GetCount() > (size_t) N )
+    if ( m_dataArray.GetCount() > (size_t) n )

     {
     {

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

     }
     else
     {
     }
     else
     {


@@ -563,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);
 }


@@ -581,21 +587,21 @@ 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") );
 
     InvalidateBestSize();
 
         wxT("invalid index in wxListBox::InsertItems") );
 
     InvalidateBestSize();
 

-    int nItems = items.GetCount();
+    unsigned int nItems = items.GetCount();

 
 

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

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


@@ -605,10 +611,10 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     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


@@ -634,7 +640,7 @@ wxSize wxListBox::DoGetBestSize() const
         }
 
         // 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} ;


@@ -647,7 +653,7 @@ 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);
         }


@@ -667,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;
 }


@@ -692,7 +698,7 @@ public:
     wxListBoxItem(const wxString& str = wxEmptyString);
 };
 
     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);


@@ -721,7 +727,7 @@ 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());

 
     }
 */
 
     }
 */


@@ -895,7 +901,7 @@ 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
     {
     }
     else
     {


@@ -918,14 +924,10 @@ void wxListBox::OnChar(wxKeyEvent& event)
 {
     if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
     {
 {
     if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER)
     {

-        wxWindow* parent = GetParent() ;
-        while( parent  && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL )
-            parent = parent->GetParent() ;
-
-        if ( parent && parent->GetDefaultItem() )
+        wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+        if ( tlw && tlw->GetDefaultItem() )

         {
         {

-            wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                wxButton);
+            wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);

             if ( def && def->IsEnabled() )
             {
                 wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
             if ( def && def->IsEnabled() )
             {
                 wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );


@@ -976,7 +978,7 @@ 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
         {
         }
         else
         {


@@ -1008,7 +1010,7 @@ void wxListBox::OnChar(wxKeyEvent& event)
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                     event.SetClientData( GetClientData(line) );
                     event.SetClientObject( GetClientObject( line ) );
                 else if ( HasClientUntypedData() )
                     event.SetClientData( GetClientData(line) );

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

 
                 event.SetInt(line);
 
 
                 event.SetInt(line);
 


@@ -1017,3 +1019,5 @@ void wxListBox::OnChar(wxKeyEvent& event)
         }
     }
 }
         }
     }
 }

+
+#endif // wxUSE_LISTBOX