Avoid an assert when m_dir is empty

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 1394c130195283b7b6a63d90112278be305f6b9c..26e6f307a0c63752f2ac53793b24bf36740b6cc1 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/carbon/listbox.cpp
+// Name:        src/osx/listbox_osx.cpp

 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: listbox.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -24,8 +24,6 @@
     #include "wx/dcclient.h"
 #endif
 
     #include "wx/dcclient.h"
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-

 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 


@@ -73,8 +71,8 @@ bool wxListBox::Create(
     const wxValidator& validator,
     const wxString& name )
 {
     const wxValidator& validator,
     const wxString& name )
 {

+    DontCreatePeer();

     m_blockEvents = false;
     m_blockEvents = false;

-    m_macIsUserPane = false;

 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   wxT("only a single listbox selection mode can be specified") );
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   wxT("only a single listbox selection mode can be specified") );


@@ -87,7 +85,7 @@ bool wxListBox::Create(
     else
         m_strings.unsorted = new wxArrayString;
 
     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 );
 
 
     MacPostControlCreate( pos, size );
 


@@ -108,8 +106,7 @@ wxListBox::~wxListBox()
     m_blockEvents = false;
 
     // make sure no native events get sent to a object in destruction
     m_blockEvents = false;
 
     // make sure no native events get sent to a object in destruction

-    delete m_peer;
-    m_peer = NULL;
+    SetPeer(NULL);

 
     if ( IsSorted() )
         delete m_strings.sorted;
 
     if ( IsSorted() )
         delete m_strings.sorted;


@@ -208,6 +205,11 @@ int wxListBox::GetSelection() const
     return GetListPeer()->ListGetSelection();
 }
 
     return GetListPeer()->ListGetSelection();
 }
 

+int wxListBox::DoListHitTest(const wxPoint& inpoint) const
+{
+    return GetListPeer()->DoListHitTest( inpoint );
+}
+

 // ----------------------------------------------------------------------------
 // display
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display
 // ----------------------------------------------------------------------------


@@ -325,7 +327,6 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
 
 void wxListBox::OnItemInserted(unsigned int WXUNUSED(pos))
 {
 
 void wxListBox::OnItemInserted(unsigned int WXUNUSED(pos))
 {

-

 }
 
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
 }
 
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,


@@ -353,6 +354,14 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
 
     GetListPeer()->UpdateLineToEnd(startpos);
 
 
     GetListPeer()->UpdateLineToEnd(startpos);
 

+    // Inserting the items may scroll the listbox down to show the last
+    // selected one but we don't want to do it as it could result in e.g. the
+    // first items of a listbox be hidden immediately after its creation so
+    // show the first selected item instead. Ideal would probably be to
+    // preserve the old selection unchanged, in fact, but I don't know how to
+    // get the first visible item so for now do at least this.
+    SetFirstItem(startpos);
+

     UpdateOldSelections();
 
     return idx;
     UpdateOldSelections();
 
     return idx;