Workaround for #15404: wxRichTextCtrl: caret does not disappear when focus is lost...

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 25a06fd79ede7a1e1eb6cf9167a403e16338a73d..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
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

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

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


@@ -24,8 +23,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 +70,11 @@ 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;
+
+    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") );
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
                   wxT("only a single listbox selection mode can be specified") );


@@ -87,7 +87,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 +108,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;


@@ -133,6 +132,11 @@ void wxListBox::FreeData()
 
 void wxListBox::DoSetFirstItem(int n)
 {
 
 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 );
 }
 
     GetListPeer()->ListScrollTo( n );
 }
 


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

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

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


@@ -225,7 +234,7 @@ void wxListBox::SetValueCallback( unsigned int WXUNUSED(n), wxListWidgetColumn*
 wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults
 wxSize wxListBox::DoGetBestSize() const
 {
     int lbWidth = 100;  // some defaults

-    int lbHeight = 110;
+    int lbHeight;

     int wLine;
 
     {
     int wLine;
 
     {


@@ -275,7 +284,8 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );

-    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);
+    static wxFont font = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+    attr.font = font;

 
     return attr;
 }
 
     return attr;
 }


@@ -324,7 +334,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,


@@ -352,6 +361,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;


@@ -375,8 +392,8 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
 
 void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
 {
 
 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) );
     event.SetEventObject( this );
     if ( HasClientObjectData() )
         event.SetClientObject( GetClientObject(n) );