avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / listbox_osx.cpp

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 624eb806ff1240f02dffb87961ce7bfd64dd622e..c48607ea5a89d3311f644b0db959f2c961ab1876 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/osx/carbon/listbox.cpp
+// Name:        src/osx/listbox_osx.cpp
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -71,8 +70,11 @@ bool wxListBox::Create(
     const wxValidator& validator,
     const wxString& name )
 {
+    DontCreatePeer();
     m_blockEvents = false;
-    m_macIsUserPane = false;
+
+    if ( ! (style & wxNO_BORDER) )
+        style = (style & ~wxBORDER_MASK) | wxSUNKEN_BORDER ;
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   wxT("only a single listbox selection mode can be specified") );
@@ -85,7 +87,7 @@ bool wxListBox::Create(
     else
         m_strings.unsorted = new wxArrayString;
 
-    m_peer = wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateListBox( this, parent, id, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
 
@@ -106,7 +108,7 @@ wxListBox::~wxListBox()
     m_blockEvents = false;
 
     // make sure no native events get sent to a object in destruction
-    wxDELETE(m_peer);
+    SetPeer(NULL);
 
     if ( IsSorted() )
         delete m_strings.sorted;
@@ -130,6 +132,11 @@ void wxListBox::FreeData()
 
 void wxListBox::DoSetFirstItem(int n)
 {
+    // osx actually only has an implementation for ensuring the visibility of a row, it does so  
+    // by scrolling the minimal amount necessary from the current scrolling position.
+    // in order to get the same behaviour I'd have to make sure first that the last line is visible, 
+    // followed by a scrollRowToVisible for the desired line 
+    GetListPeer()->ListScrollTo( GetCount()-1 );
     GetListPeer()->ListScrollTo( n );
 }
 
@@ -327,7 +334,6 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
 
 void wxListBox::OnItemInserted(unsigned int WXUNUSED(pos))
 {
-
 }
 
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
@@ -386,8 +392,8 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {
-    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED :
-        wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
+    wxCommandEvent event( doubleClick ? wxEVT_LISTBOX_DCLICK :
+        wxEVT_LISTBOX, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )
         event.SetClientObject( GetClientObject(n) );