fix memory leak in wxScreenDC, fixes #13249

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 9ab8efb30e9cda29e6d56f31bd9985afaadb78ab..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,8 +85,8 @@ 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 );
 
     m_textColumn = GetListPeer()->InsertTextColumn(0,wxEmptyString);
     MacPostControlCreate( pos, size );
 
     m_textColumn = GetListPeer()->InsertTextColumn(0,wxEmptyString);


@@ -103,10 +101,12 @@ bool wxListBox::Create(
 
 wxListBox::~wxListBox()
 {
 
 wxListBox::~wxListBox()
 {

+    m_blockEvents = true;

     FreeData();
     FreeData();

+    m_blockEvents = false;
+

     // make sure no native events get sent to a object in destruction
     // 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;


@@ -152,7 +152,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;
 
     GetListPeer()->ListDelete( n );
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -161,7 +161,7 @@ void wxListBox::DoClear()
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;
     m_blockEvents = true;
     FreeData();
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -175,14 +175,14 @@ void wxListBox::DoSetSelection(int n, bool select)
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;
         wxT("invalid index in wxListBox::SetSelection") );
 
     m_blockEvents = true;

-    
+

     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );
     if ( n == wxNOT_FOUND )
         GetListPeer()->ListDeselectAll();
     else
         GetListPeer()->ListSetSelection( n, select, HasMultipleSelection() );

-        
+

     m_blockEvents = false;
     m_blockEvents = false;

-    
+

     UpdateOldSelections();
 }
 
     UpdateOldSelections();
 }
 


@@ -205,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
 // ----------------------------------------------------------------------------


@@ -215,14 +220,14 @@ void wxListBox::GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxLi
         value.Set( GetString( n ) );
 }
 
         value.Set( GetString( n ) );
 }
 

-void wxListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value )
+void wxListBox::SetValueCallback( unsigned int WXUNUSED(n), wxListWidgetColumn* WXUNUSED(col) , wxListWidgetCellValue& WXUNUSED(value) )

 {
 }
 
 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;
 
     {


@@ -272,7 +277,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;
 }


@@ -321,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,


@@ -349,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;


@@ -356,7 +369,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
 
 void wxListBox::SetString(unsigned int n, const wxString& s)
 {
 
 void wxListBox::SetString(unsigned int n, const wxString& s)
 {

-    wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
+    wxCHECK_RET( !IsSorted(), wxT("can't set string in sorted listbox") );

 
     if ( IsSorted() )
         (*m_strings.sorted)[n] = s;
 
     if ( IsSorted() )
         (*m_strings.sorted)[n] = s;


@@ -372,7 +385,7 @@ 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 : 
+    wxCommandEvent event( doubleClick ? wxEVT_COMMAND_LISTBOX_DOUBLECLICKED :

         wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )
         wxEVT_COMMAND_LISTBOX_SELECTED, GetId() );
     event.SetEventObject( this );
     if ( HasClientObjectData() )


@@ -385,4 +398,20 @@ void wxListBox::HandleLineEvent( unsigned int n, bool doubleClick )
     HandleWindowEvent(event);
 }
 
     HandleWindowEvent(event);
 }
 

+//
+// common list cell value operations
+//
+
+void wxListWidgetCellValue::Check( bool check )
+{
+    Set( check ? 1 : 0 );
+}
+
+bool wxListWidgetCellValue::IsChecked() const
+{
+    return GetIntValue() != 0;
+}
+
+
+

 #endif // wxUSE_LISTBOX
 #endif // wxUSE_LISTBOX