corrected MacSetSelection which was incorrectly deselecting also the previously selec...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index f6c1403b1c4c4a9b32e12e48ee6e6ee401133dce..d4dbdffb510aece4893bc98fa0bfc964a91f6438 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -663,9 +663,12 @@ void wxListBox::MacClear()
 void wxListBox::MacSetSelection( int n , bool select )
 {
        Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( true , &cell , m_macList ) )
+       if ( ! (m_windowStyle & wxLB_MULTIPLE) )
        {
-               LSetSelect( false , cell , m_macList ) ;
+       if ( LGetSelect( true , &cell , m_macList ) )
+       {
+               LSetSelect( false , cell , m_macList ) ;
+       }
        }
        
        cell.v = n ;

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index f6c1403b1c4c4a9b32e12e48ee6e6ee401133dce..d4dbdffb510aece4893bc98fa0bfc964a91f6438 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -663,9 +663,12 @@ void wxListBox::MacClear()
 void wxListBox::MacSetSelection( int n , bool select )
 {
        Cell cell = { 0 , 0 } ;
-       if ( LGetSelect( true , &cell , m_macList ) )
+       if ( ! (m_windowStyle & wxLB_MULTIPLE) )
        {
-               LSetSelect( false , cell , m_macList ) ;
+       if ( LGetSelect( true , &cell , m_macList ) )
+       {
+               LSetSelect( false , cell , m_macList ) ;
+       }
        }
        
        cell.v = n ;