Forgot ! in wxTreeCtrl flag test.

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

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 3b062f04e521ea681e4c33e18450133eba97855d..1ed703e186506a9856d770a9922b075181c25dc3 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -13,19 +13,26 @@
 #pragma implementation "listbox.h"
 #endif
 
+#include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/settings.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#include "extldef.h"
+#ifdef __UNIX__
+  #include "ldef/extldef.h"
+#else
+  #include "extldef.h"
+#endif
 
+#if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
        EVT_SIZE( wxListBox::OnSize ) 
 END_EVENT_TABLE()
+#endif
 
 #include <wx/mac/uma.h>
 
@@ -41,6 +48,7 @@ wxListBox::wxListBox()
 {
   m_noItems = 0;
   m_selected = 0;
+  m_macList = NULL ;
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
@@ -56,8 +64,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
        Rect bounds ;
        Str255 title ;
-       m_macHorizontalBorder = 5 ; // additional pixels around the real control
-       m_macVerticalBorder = 5 ;
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
@@ -67,9 +73,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        long    result ;
        UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
+       HLock( (Handle) m_macList ) ;
        NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-       (**m_macList).selFlags = lOnlyOne ;
-       if ( style  & wxLB_MULTIPLE )
+       (**m_macList).selFlags = 0 ;
+       if ( style & wxLB_MULTIPLE )
        {
                (**m_macList).selFlags += lNoExtend ;
        }
@@ -77,6 +84,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        {
                (**m_macList).selFlags += lExtendDrag ;
        }
+       else
+       {
+               (**m_macList).selFlags = lOnlyOne ;
+       }
        Point pt = (**m_macList).cellSize ;
        pt.v = 14 ;
        LCellSize( pt , m_macList ) ;
@@ -105,7 +116,11 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 wxListBox::~wxListBox()
 {
        Free() ;
-       DisposeExtLDEFInfo( m_macList ) ;
+       if ( m_macList )
+       {
+               DisposeExtLDEFInfo( m_macList ) ;
+               m_macList = NULL ;
+       }
 }
 
 void wxListBox::Free()
@@ -151,7 +166,8 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;
-       m_noItems --;
+       m_dataArray.Remove( N ) ;
+       m_noItems --;
        
        MacDelete( N ) ;
 }
@@ -162,10 +178,14 @@ int wxListBox::DoAppend(const wxString& item)
        if( wxApp::s_macDefaultEncodingIsPC )
        {
                m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
+               m_dataArray.Add( NULL );
        }
-       else
+       else {
                m_stringArray.Add( item ) ;
+               m_dataArray.Add( NULL );
+       }
        m_noItems ++;
+       DoSetItemClientData( index , NULL ) ;
        MacAppend( item ) ;
 
        return index ;
@@ -185,7 +205,7 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
             wxASSERT_MSG(clientData[i] == NULL,
                          wxT("Can't use client data with owner-drawn listboxes"));
 #else // !wxUSE_OWNER_DRAWN
-               Append( choices[i] , clientData[0] ) ;
+               Append( choices[i] , clientData[i] ) ;
  #endif
        }
        else
@@ -231,19 +251,59 @@ int wxListBox::FindString(const wxString& st) const
        {
                wxString search = s.Left( s.Length() - 1 ) ;
                int len = search.Length() ;
-    for ( int i = 0 ; i < m_noItems ; ++ i )
-    {
-       if ( equalstring( m_stringArray[i].Left( len ) , search , false , false ) )
-               return i ;
-    }
+               Str255 s1 , s2 ;
+
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
+#else
+               strcpy( (char *) s2 , search.c_str() ) ;
+               c2pstr( (char *) s2 ) ;
+#endif
+
+       for ( int i = 0 ; i < m_noItems ; ++ i )
+           {
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+#else
+               strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+                       c2pstr( (char *) s1 ) ;
+#endif
+               if ( EqualString( s1 , s2 , false , false ) )
+                       return i ;
+           }
+           if ( s.Left(1) = "*" && s.Length() > 1 )
+           {
+               s.MakeLower() ;
+                   for ( int i = 0 ; i < m_noItems ; ++i )
+                       {
+                               if ( GetString(i).Lower().Matches(s) )
+                                       return i ;
+                       }
+               }       
+
        }
        else
        {
-    for ( int i = 0 ; i < m_noItems ; ++ i )
-    {
-       if ( equalstring( m_stringArray[i] , s , false , false ) )
-               return i ;
-    }
+       Str255 s1 , s2 ;
+
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
+#else
+               strcpy( (char *) s2 , s.c_str() ) ;
+               c2pstr( (char *) s2 ) ;
+#endif
+
+           for ( int i = 0 ; i < m_noItems ; ++ i )
+           {
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
+#else
+               strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
+                       c2pstr( (char *) s1 ) ;
+#endif
+               if ( EqualString( s1 , s2 , false , false ) )
+                       return i ;
+           }
    }
    return -1;
 }
@@ -298,7 +358,16 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN
-    m_dataArray[N] = (char*) Client_data ;
+       wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+       
+       if ( m_dataArray.GetCount() > N )
+       {
+       m_dataArray[N] = (char*) Client_data ;
+    }
+    else
+    {
+       m_dataArray.Add( (char*) Client_data ) ;
+    }
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
@@ -365,7 +434,14 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
 void wxListBox::SetString(int N, const wxString& s)
 {
-       m_stringArray[N] = s ;
+       wxString str ;
+       if( wxApp::s_macDefaultEncodingIsPC )
+       {
+               str = wxMacMakeMacStringFromPC( s )  ;
+       }
+       else
+               str = s ;
+       m_stringArray[N] = str ;
        MacSet( N , s ) ;
 }
 
@@ -429,7 +505,6 @@ void wxListBox::MacDelete( int N )
 {
        ListHandle list ;
        long    result ;
-       Cell cell = { 0 , 0 } ;
        UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &list  , &result ) ;
        LDelRow( 1 , N , list ) ;
 }
@@ -525,7 +600,7 @@ void wxListBox::MacScrollTo( int n )
 void wxListBox::OnSize( const wxSizeEvent &event)
 {
        Point pt = (**m_macList).cellSize ;
-       pt.h =  m_width - 15 /* scrollbar */ - m_macHorizontalBorder * 2 ;
+       pt.h =  m_width - 15  ;
        LCellSize( pt , m_macList ) ;
 }