remove run-time check for now-required GTK 2.4

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

diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp
index 624eb806ff1240f02dffb87961ce7bfd64dd622e..982dad0705c1bf5fe6515172908fd35691aad474 100644 (file)
--- a/src/osx/listbox_osx.cpp
+++ b/src/osx/listbox_osx.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListBox
 // Author:      Stefan Csomor
 // Modified by:


@@ -71,8 +71,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") );


@@ -85,7 +88,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 );
 


@@ -106,7 +109,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

-    wxDELETE(m_peer);
+    SetPeer(NULL);

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


@@ -327,7 +330,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,