fixed bug in mouse handling

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

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 9d1220bc90afc1cefc3b4e3508156dbfdaca30b1..6564af7b7777ee1a33213e0a7cea0433eb16561a 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -43,6 +43,7 @@ wxListBox::wxListBox()
 {
   m_noItems = 0;
   m_selected = 0;
 {
   m_noItems = 0;
   m_selected = 0;

+  m_macList = NULL ;

 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,


@@ -58,8 +59,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
        Rect bounds ;
        Str255 title ;
 
        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 ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 


@@ -69,9 +68,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        long    result ;
        UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
        long    result ;
        UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 

+       HLock( (Handle) m_macList ) ;

        NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
        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 ;
        }
        {
                (**m_macList).selFlags += lNoExtend ;
        }


@@ -79,6 +79,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
        {
                (**m_macList).selFlags += lExtendDrag ;
        }
        {
                (**m_macList).selFlags += lExtendDrag ;
        }

+       else
+       {
+               (**m_macList).selFlags = lOnlyOne ;
+       }

        Point pt = (**m_macList).cellSize ;
        pt.v = 14 ;
        LCellSize( pt , m_macList ) ;
        Point pt = (**m_macList).cellSize ;
        pt.v = 14 ;
        LCellSize( pt , m_macList ) ;


@@ -107,7 +111,11 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 wxListBox::~wxListBox()
 {
        Free() ;
 wxListBox::~wxListBox()
 {
        Free() ;

-       DisposeExtLDEFInfo( m_macList ) ;
+       if ( m_macList )
+       {
+               DisposeExtLDEFInfo( m_macList ) ;
+               m_macList = NULL ;
+       }

 }
 
 void wxListBox::Free()
 }
 
 void wxListBox::Free()


@@ -153,7 +161,8 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
        m_stringArray.Remove( N ) ;

-       m_noItems --;
+       m_dataArray.Remove( N ) ;
+       m_noItems --;

        
        MacDelete( N ) ;
 }
        
        MacDelete( N ) ;
 }


@@ -187,7 +196,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
             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
  #endif
        }
        else


@@ -233,19 +242,29 @@ int wxListBox::FindString(const wxString& st) const
        {
                wxString search = s.Left( s.Length() - 1 ) ;
                int len = search.Length() ;
        {
                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 ;
+           strcpy( (char*) s2 , search.c_str() ) ;
+           c2pstr( (char*) s2 ) ;
+       for ( int i = 0 ; i < m_noItems ; ++ i )
+           {
+               strcpy( (char*) s1 , m_stringArray[i].Left( len ).c_str() ) ;
+               c2pstr( (char*) s1 ) ;
+               if ( EqualString( s1 , s2 , false , false ) )
+                       return i ;
+           }

        }
        else
        {
        }
        else
        {

-    for ( int i = 0 ; i < m_noItems ; ++ i )
-    {
-       if ( equalstring( m_stringArray[i] , s , false , false ) )
-               return i ;
-    }
+       Str255 s1 , s2 ;
+           strcpy( (char*) s2 , s.c_str() ) ;
+           c2pstr( (char*) s2 ) ;
+           for ( int i = 0 ; i < m_noItems ; ++ i )
+           {
+               strcpy( (char*) s1 , m_stringArray[i].c_str() ) ;
+               c2pstr( (char*) s1 ) ;
+               if ( EqualString( s1 , s2 , false , false ) )
+                       return i ;
+           }

    }
    return -1;
 }
    }
    return -1;
 }


@@ -300,7 +319,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
         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)
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)


@@ -367,11 +395,18 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
 void wxListBox::SetString(int N, const wxString& s)
 {
 
 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 ) ;
 }
 
        MacSet( N , s ) ;
 }
 

-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const

 {
     return wxSize(100, 100);
 }
 {
     return wxSize(100, 100);
 }


@@ -527,7 +562,7 @@ void wxListBox::MacScrollTo( int n )
 void wxListBox::OnSize( const wxSizeEvent &event)
 {
        Point pt = (**m_macList).cellSize ;
 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 ) ;
 }
 
        LCellSize( pt , m_macList ) ;
 }
 


@@ -562,8 +597,8 @@ void wxListBox::MacDoClick()
        int n, count = GetSelections(aSelections);
        if ( count > 0 )
        {
        int n, count = GetSelections(aSelections);
        if ( count > 0 )
        {

-                 event.m_commandInt = aSelections[0] ;
-          if ( HasClientObjectData() )
+           n = aSelections[0];
+           if ( HasClientObjectData() )

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