/////////////////////////////////////////////////////////////////////////////
-// 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$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
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 );
// adding/deleting items to/from the list
// ----------------------------------------------------------------------------
+void wxChoice::DoAfterItemCountChange()
+{
+ InvalidateBestSize();
+
+ GetPeer()->SetMaximum( GetCount() );
+}
+
int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData, wxClientDataType type)
{
unsigned int idx;
-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS
if ( IsSorted() )
{
wxArrayString::iterator
m_strings.insert( insertPoint, items[i] );
}
else
-#endif // wxUSE_STL
+#endif // wxUSE_STD_CONTAINERS
{
idx = pos;
m_strings.Insert( items[i], idx );
AssignNewItemClientData(idx, clientData, i, type);
}
- m_peer->SetMaximum( GetCount() );
+ DoAfterItemCountChange();
return pos - 1;
}
m_strings.RemoveAt( n ) ;
m_datas.RemoveAt( n ) ;
- m_peer->SetMaximum( GetCount() ) ;
+ DoAfterItemCountChange();
}
void wxChoice::DoClear()
m_strings.Empty() ;
m_datas.Empty() ;
- m_peer->SetMaximum( 0 ) ;
+ DoAfterItemCountChange();
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
int wxChoice::GetSelection() const
{
- return m_peer->GetValue();
+ return GetPeer()->GetValue();
}
void wxChoice::SetSelection( int n )
{
- m_peer->SetValue( n );
+ GetPeer()->SetValue( n );
}
// ----------------------------------------------------------------------------
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;
// ----------------------------------------------------------------------------
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::OSXHandleClicked( double WXUNUSED(timestampsec) )
{
- wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
-
- // actually n should be made sure by the os to be a valid selection, but ...
- int n = GetSelection();
- if ( n > -1 )
- {
- event.SetInt( n );
- event.SetString( GetStringSelection() );
- event.SetEventObject( this );
-
- if ( HasClientObjectData() )
- event.SetClientObject( GetClientObject( n ) );
- else if ( HasClientUntypedData() )
- event.SetClientData( GetClientData( n ) );
-
- ProcessCommand( event );
- }
+ SendSelectionChangedEvent(wxEVT_CHOICE);
return true ;
}
wxSize wxChoice::DoGetBestSize() const
{
- int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults
- wxSize baseSize = wxWindow::DoGetBestSize();
- int lbHeight = baseSize.y;
- int wLine;
-
- {
- wxClientDC dc(const_cast<wxChoice*>(this));
-
- // Find the widest line
- for(unsigned int i = 0; i < GetCount(); i++)
- {
- wxString str(GetString(i));
-
- wxCoord width, height ;
- dc.GetTextExtent( str , &width, &height);
- wLine = width ;
-
- lbWidth = wxMax( lbWidth, wLine ) ;
- }
-
- // Add room for the popup arrow
- lbWidth += 2 * lbHeight ;
-
- wxCoord width, height ;
- dc.GetTextExtent( wxT("X"), &width, &height);
- int cx = width ;
-
- lbWidth += cx ;
- }
+ // We use the base window size for the height (which is wrong as it doesn't
+ // take the font into account -- TODO) and add some margins to the width
+ // computed by the base class method to account for the arrow.
+ const int lbHeight = wxWindow::DoGetBestSize().y;
- return wxSize( lbWidth, lbHeight );
+ return wxSize(wxChoiceBase::DoGetBestSize().x + 2*lbHeight + GetCharWidth(),
+ lbHeight);
}
#endif // wxUSE_CHOICE