Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index 4bc08e371bfb81f05d3bf851384f33b1093f12b7..e610b8c86fff6888b364375dbfe10339d198d96c 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/osx/carbon/choice.cpp
+// Name:        src/osx/choice_osx.cpp
 // Purpose:     wxChoice
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id: choice.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,8 +22,6 @@
 
 #include "wx/osx/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )
@@ -67,20 +65,20 @@ bool wxChoice::Create(wxWindow *parent,
     long style,
     const wxValidator& validator,
     const wxString& name )
-{
-    m_macIsUserPane = false;
-
+{    
+    DontCreatePeer();
+    
     if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) )
         return false;
-        
+
     m_popUpMenu = new wxMenu();
     m_popUpMenu->SetNoEventsMode(true);
-    
-    m_peer = wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
+
+    SetPeer(wxWidgetImpl::CreateChoice( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
 
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
     if ( style & wxCB_SORT )
         // autosort
         m_strings = wxArrayString( 1 );
@@ -111,7 +109,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
     {
         unsigned int idx;
 
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
         if ( IsSorted() )
         {
             wxArrayString::iterator
@@ -120,18 +118,21 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
             m_strings.insert( insertPoint, items[i] );
         }
         else
-#endif // wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS
         {
             idx = pos;
             m_strings.Insert( items[i], idx );
         }
 
-        m_popUpMenu->Insert( idx, i+1, items[i] );
+        wxString text = items[i];
+        if (text == wxEmptyString)
+            text = " ";  // menu items can't have empty labels
+        m_popUpMenu->Insert( idx, i+1, text );
         m_datas.Insert( NULL, idx );
         AssignNewItemClientData(idx, clientData, i, type);
     }
 
-    m_peer->SetMaximum( GetCount() );
+    GetPeer()->SetMaximum( GetCount() );
 
     return pos - 1;
 }
@@ -142,12 +143,12 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 
     if ( HasClientObjectData() )
         delete GetClientObject( n );
-    
+
     m_popUpMenu->Delete( m_popUpMenu->FindItemByPosition( n ) );
 
     m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;
-    m_peer->SetMaximum( GetCount() ) ;
+    GetPeer()->SetMaximum( GetCount() ) ;
 
 }
 
@@ -161,7 +162,7 @@ void wxChoice::DoClear()
     m_strings.Empty() ;
     m_datas.Empty() ;
 
-    m_peer->SetMaximum( 0 ) ;
+    GetPeer()->SetMaximum( 0 ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -169,12 +170,12 @@ void wxChoice::DoClear()
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {
-    return m_peer->GetValue() -1;
+    return GetPeer()->GetValue();
 }
 
 void wxChoice::SetSelection( int n )
 {
-    m_peer->SetValue( n ) ;
+    GetPeer()->SetValue( n );
 }
 
 // ----------------------------------------------------------------------------
@@ -188,7 +189,7 @@ unsigned int wxChoice::GetCount() const
 
 int wxChoice::FindString( const wxString& s, bool bCase ) const
 {
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
     // Avoid assert for non-default args passed to sorted array Index
     if ( IsSorted() )
         bCase = true;
@@ -218,19 +219,15 @@ wxString wxChoice::GetString(unsigned int n) const
 // ----------------------------------------------------------------------------
 void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 {
-    wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") );
-
     m_datas[n] = (char*)clientData ;
 }
 
 void * wxChoice::DoGetItemClientData(unsigned int n) const
 {
-    wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );
-
     return (void *)m_datas[n];
 }
 
-bool wxChoice::HandleClicked( double timestampsec )
+bool wxChoice::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 
@@ -241,7 +238,7 @@ bool wxChoice::HandleClicked( double timestampsec )
         event.SetInt( n );
         event.SetString( GetStringSelection() );
         event.SetEventObject( this );
-        
+
         if ( HasClientObjectData() )
             event.SetClientObject( GetClientObject( n ) );
         else if ( HasClientUntypedData() )
@@ -256,7 +253,8 @@ bool wxChoice::HandleClicked( double timestampsec )
 wxSize wxChoice::DoGetBestSize() const
 {
     int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
-    int lbHeight = 20;
+    wxSize baseSize = wxWindow::DoGetBestSize();
+    int lbHeight = baseSize.y;
     int wLine;
 
     {
@@ -280,7 +278,6 @@ wxSize wxChoice::DoGetBestSize() const
         wxCoord width, height ;
         dc.GetTextExtent( wxT("X"), &width, &height);
         int cx = width ;
-        lbHeight += 4;
 
         lbWidth += cx ;
     }