X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..b838cfc9151aea38402ad2b1ba5d2f97cf94e973:/src/mac/listbox.cpp?ds=sidebyside

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index c518ad035c..780e28bc7e 100644
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -13,19 +13,24 @@
 #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"
+#ifndef __DARWIN__
+  #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 +46,7 @@ wxListBox::wxListBox()
 {
   m_noItems = 0;
   m_selected = 0;
+  m_macList = NULL ;
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
@@ -51,65 +57,107 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
-  m_noItems = 0 ; // this will be increased by our append command
-  m_selected = 0;
-
-	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 ) ;
+    m_noItems = 0 ; // this will be increased by our append command
+    m_selected = 0;
+    
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , kwxMacListWithVerticalScrollbar , 0 , 0, 
-	  	kControlListBoxProc , (long) this ) ;
-	
-	long	result ;
-	UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag , sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
-
-	NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
-	(**m_macList).selFlags = 0 ;
-	if ( style & wxLB_MULTIPLE )
-	{
-		(**m_macList).selFlags += lNoExtend ;
-	}
-	else if ( style & wxLB_EXTENDED )
-	{
-		(**m_macList).selFlags += lExtendDrag ;
-	}
-	else
-	{
-		(**m_macList).selFlags = lOnlyOne ;
-	}
-	Point pt = (**m_macList).cellSize ;
-	pt.v = 14 ;
-	LCellSize( pt , m_macList ) ;
+#if TARGET_CARBON
+    ListDefSpec listDef;
+    OptionBits  options;
+    Size asize;
 
-	LAddColumn( 1 , 0 , m_macList ) ;
+    listDef.defType = kListDefStandardTextType;
 
-	MacPostControlCreate() ;
+    CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
+                          14, 14, false, &listDef, &m_macControl );
 
-	ControlFontStyleRec		controlstyle ;
-	controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
-	//controlstyle.font = kControlFontSmallSystemFont ;
-	controlstyle.font = kFontIDMonaco ;
-	controlstyle.size = 9 ;
-	::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+    GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
+                   sizeof(ListHandle), (Ptr) &m_macList, &asize);
 
-	for ( int i = 0 ; i < n ; i++ )
-	{
-		Append( choices[i] ) ;
-	}
+    SetControlReference(m_macControl, (long) this);
+    SetControlVisibility(m_macControl, false, false);
 
-	LSetDrawingMode( true , m_macList ) ;
+    options = 0;
+    if ( style & wxLB_MULTIPLE )
+    {
+        options += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+        options += lExtendDrag ;
+    }
+    else
+    {
+        options = lOnlyOne ;
+    }
+    SetListSelectionFlags(m_macList, options);
+
+#else
+    long	result ;
+
+    m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+				  kwxMacListWithVerticalScrollbar , 0 , 0, 
+				  kControlListBoxProc , (long) this ) ;
+    UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+		       sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
+
+    HLock( (Handle) m_macList ) ;
+    NewExtLDEFInfo( m_macList , MacDrawStringCell , (long) this ) ;
+    
+    (**m_macList).selFlags = 0 ;
+    if ( style & wxLB_MULTIPLE )
+    {
+	(**m_macList).selFlags += lNoExtend ;
+    }
+    else if ( style & wxLB_EXTENDED )
+    {
+	(**m_macList).selFlags += lExtendDrag ;
+    }
+    else
+    {
+	(**m_macList).selFlags = lOnlyOne ;
+    }
+    
+    Point pt = (**m_macList).cellSize ;
+    pt.v = 14 ;
+    LCellSize( pt , m_macList ) ;
+    
+    LAddColumn( 1 , 0 , m_macList ) ;
+    
+    ControlFontStyleRec		controlstyle ;
+    controlstyle.flags = kControlUseFontMask + kControlUseSizeMask ;
+    //controlstyle.font = kControlFontSmallSystemFont ;
+    controlstyle.font = kFontIDMonaco ;
+    controlstyle.size = 9 ;
+    //::UMASetControlFontStyle( m_macControl , &controlstyle ) ;
+#endif
+    
+    MacPostControlCreate() ;
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+	Append( choices[i] ) ;
+    }
+    
+    LSetDrawingMode( true , m_macList ) ;
 
-  return TRUE;
+    return TRUE;
 }
 
 wxListBox::~wxListBox()
 {
 	Free() ;
-	DisposeExtLDEFInfo( m_macList ) ;
+	if ( m_macList )
+	{
+#if !TARGET_CARBON
+	    DisposeExtLDEFInfo( m_macList ) ;
+#endif
+	    m_macList = NULL ;
+	}
 }
 
 void wxListBox::Free()
@@ -155,8 +203,8 @@ void wxListBox::Delete(int N)
     }
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
 	m_stringArray.Remove( N ) ;
-	m_dataArray.Remove( N ) ;
-  	m_noItems --;
+	m_dataArray.RemoveAt( N ) ;
+	m_noItems --;
 	
 	MacDelete( N ) ;
 }
@@ -167,10 +215,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 ;
@@ -236,19 +288,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;
 }
@@ -280,7 +372,7 @@ bool wxListBox::IsSelected(int N) const
 void *wxListBox::DoGetItemClientData(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
-                 "invalid index in wxListBox::GetClientData" );
+                 wxT("invalid index in wxListBox::GetClientData"));
 
     return (void *)m_dataArray[N];
 }
@@ -308,7 +400,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
 	if ( m_dataArray.GetCount() > N )
 	{
     	m_dataArray[N] = (char*) Client_data ;
-	}
+    }
     else
     {
     	m_dataArray.Add( (char*) Client_data ) ;
@@ -379,7 +471,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 ) ;
 }
 
@@ -399,6 +498,16 @@ void wxListBox::SetupColours()
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
+void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
+{
+    // Set up port
+    WindowRef rootwindow = GetMacRootWindow() ;
+    wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
+    wxMacDrawingHelper focus( wxrootwindow );
+
+    UMADrawControl(m_macControl);
+}
+
 #if wxUSE_OWNER_DRAWN
 
 class wxListBoxItem : public wxOwnerDrawn
@@ -441,39 +550,38 @@ void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refC
 
 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 ) ;
+    LDelRow( 1 , N , m_macList) ;
+    Refresh();
 }
 
 void wxListBox::MacInsert( int n , const char * text) 
 {
-	Cell	cell ;
-
-	cell.h = 0 ;
-	cell.v = n ;
-
-	LAddRow( 1 , cell.v , m_macList ) ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = n ;
+    LAddRow( 1 , cell.v , m_macList ) ;
+    LSetCell(text, strlen(text), cell, m_macList);
+    Refresh();
 }
 
 void wxListBox::MacAppend( const char * text) 
 {
-	Cell cell = { 0 , 0 } ;
-	cell.v = (**m_macList).dataBounds.bottom ;
-	LAddRow( 1 , cell.v , m_macList ) ;
+    Cell cell = { 0 , 0 } ;
+    cell.v = (**m_macList).dataBounds.bottom ;
+    LAddRow( 1 , cell.v , m_macList ) ;
+    LSetCell(text, strlen(text), cell, m_macList);
+    Refresh();
 }
 
 void wxListBox::MacClear() 
 {
-	LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+    LDelRow( (**m_macList).dataBounds.bottom , 0 , m_macList ) ;
+    Refresh();
 }
 
 void wxListBox::MacSetSelection( int n , bool select )
 {
 	Cell cell = { 0 , 0 } ;
-	if ( LGetSelect( TRUE , &cell , m_macList ) )
+	if ( LGetSelect( true , &cell , m_macList ) )
 	{
 		LSetSelect( false , cell , m_macList ) ;
 	}
@@ -481,6 +589,7 @@ void wxListBox::MacSetSelection( int n , bool select )
 	cell.v = n ;
 	LSetSelect( select , cell , m_macList ) ;
 	LAutoScroll( m_macList ) ;
+	Refresh();
 }
 
 bool wxListBox::MacIsSelected( int n ) const
@@ -492,7 +601,7 @@ bool wxListBox::MacIsSelected( int n ) const
 
 void wxListBox::MacDestroy()
 {
-//	DisposeExtLDEFInfo( m_macList ) ;
+//    DisposeExtLDEFInfo( m_macList ) ;
 }
 
 int wxListBox::MacGetSelection() const
@@ -528,7 +637,8 @@ void wxListBox::MacSet( int n , const char * text )
 	// so we just have to redraw
 	Cell cell = { 0 , 0 } ;
 	cell.v = n ;
-	LDraw( cell , m_macList ) ;
+	LSetCell(text, strlen(text), cell, m_macList);
+	Refresh();
 }
 
 void wxListBox::MacScrollTo( int n )
@@ -538,9 +648,15 @@ 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 ;
-	LCellSize( pt , m_macList ) ;
+    Point pt;
+
+#if TARGET_CARBON
+    GetListCellSize(m_macList, &pt);
+#else
+    pt = (**m_macList).cellSize ;
+#endif
+    pt.h =  m_width - 15  ;
+    LCellSize( pt , m_macList ) ;
 }
 
 void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart )