#if wxUSE_CHOICE
#include "wx/choice.h"
-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/menu.h"
+ #include "wx/dcclient.h"
+#endif
+
#include "wx/mac/uma.h"
extern MenuHandle NewUniqueMenu() ;
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
wxChoice::~wxChoice()
{
if ( HasClientObjectData() )
{
- size_t i, max = GetCount();
+ unsigned int i, max = GetCount();
for ( i = 0; i < max; ++i )
delete GetClientObject( i );
const wxValidator& validator,
const wxString& name )
{
- wxCArrayString chs( choices );
-
return Create(
- parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ parent, id, pos, size, 0, NULL,
style, validator, name );
+
+ Append( choices );
+
+ if ( !choices.empty() )
+ SetSelection( 0 );
}
bool wxChoice::Create(wxWindow *parent,
m_strings = wxArrayString( 1 );
#endif
- for ( int i = 0; i < n; i++ )
- {
- Append( choices[i] );
- }
+ Append(n, choices);
// Set the first item as being selected
if (n > 0)
SetSelection( 0 );
// Needed because it is a wxControlWithItems
- SetBestSize( size );
+ SetInitialSize( size );
return true;
}
// ----------------------------------------------------------------------------
// adding/deleting items to/from the list
// ----------------------------------------------------------------------------
-int wxChoice::DoAppend( const wxString& item )
-{
-#if wxUSE_STL
- wxArrayString::iterator insertPoint;
- size_t index;
- if (GetWindowStyle() & wxCB_SORT)
- {
- insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), item );
- index = insertPoint - m_strings.begin();
- }
- else
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
+{
+ const unsigned int numItems = items.GetCount();
+ for( unsigned int i = 0; i < numItems; ++i, ++pos )
{
- insertPoint = m_strings.end();
- index = m_strings.size();
- }
+ unsigned int idx;
- m_strings.insert( insertPoint, item );
-#else
- size_t index = m_strings.Add( item );
-#endif
-
- m_datas.Insert( NULL , index );
- UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), index );
- DoSetItemClientData( index, NULL );
- m_peer->SetMaximum( GetCount() );
-
- return index;
-}
-
-int wxChoice::DoInsert( const wxString& item, int pos )
-{
- wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, wxT("wxChoice::DoInsert: can't insert into sorted list") );
- wxCHECK_MSG( IsValidInsert(pos), -1, wxT("wxChoice::DoInsert: invalid index") );
+#if wxUSE_STL
+ if ( IsSorted() )
+ {
+ wxArrayString::iterator
+ insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), items[i] );
+ idx = insertPoint - m_strings.begin();
+ m_strings.insert( insertPoint, items[i] );
+ }
+ else
+#endif // wxUSE_STL
+ {
+ idx = pos;
+ m_strings.Insert( items[i], idx );
+ }
- if ((size_t)pos == GetCount())
- return DoAppend( item );
+ UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ),
+ items[i],
+ m_font.GetEncoding(),
+ idx);
+ m_datas.Insert( NULL, idx );
+ AssignNewItemClientData(idx, clientData, i, type);
+ }
- UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), pos );
- m_strings.Insert( item, pos );
- m_datas.Insert( NULL, pos );
- DoSetItemClientData( pos, NULL );
m_peer->SetMaximum( GetCount() );
- return pos;
+ return pos - 1;
}
-void wxChoice::Delete( int n )
+void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") );
m_peer->SetMaximum( GetCount() ) ;
}
-void wxChoice::Clear()
+void wxChoice::DoClear()
{
- FreeData();
- for ( size_t i = 0 ; i < GetCount() ; i++ )
+ for ( unsigned int i = 0 ; i < GetCount() ; i++ )
{
::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
}
m_peer->SetMaximum( 0 ) ;
}
-void wxChoice::FreeData()
-{
- if ( HasClientObjectData() )
- {
- size_t count = GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- delete GetClientObject( n );
- }
- }
-}
-
// ----------------------------------------------------------------------------
// selection
// ----------------------------------------------------------------------------
// string list functions
// ----------------------------------------------------------------------------
-size_t wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const
{
return m_strings.GetCount() ;
}
int wxChoice::FindString( const wxString& s, bool bCase ) const
{
+#if !wxUSE_STL
+ // Avoid assert for non-default args passed to sorted array Index
+ if ( IsSorted() )
+ bCase = true;
+#endif
+
return m_strings.Index( s , bCase ) ;
}
-void wxChoice::SetString( int n, const wxString& s )
+void wxChoice::SetString(unsigned int n, const wxString& s)
{
wxCHECK_RET( IsValid(n), wxT("wxChoice::SetString(): invalid index") );
UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;
}
-wxString wxChoice::GetString( int n ) const
+wxString wxChoice::GetString(unsigned int n) const
{
wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") );
// ----------------------------------------------------------------------------
// client data
// ----------------------------------------------------------------------------
-void wxChoice::DoSetItemClientData( int n, void* clientData )
+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( int n ) const
+void * wxChoice::DoGetItemClientData(unsigned int n) const
{
wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );
return (void *)m_datas[n];
}
-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
-{
- DoSetItemClientData( n, clientData ) ;
-}
-
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
-{
- return (wxClientData*)DoGetItemClientData( n ) ;
-}
-
wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
int wLine;
#if TARGET_CARBON
- long metric ;
+ SInt32 metric ;
GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
lbHeight = metric ;
#endif
{
+#if wxMAC_USE_CORE_GRAPHICS
+ wxClientDC dc(const_cast<wxChoice*>(this));
+#else
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
if ( m_font.Ok() )
{
::TextSize( 9 ) ;
::TextFace( 0 ) ;
}
-
+#endif
// Find the widest line
- for(size_t i = 0; i < GetCount(); i++)
+ for(unsigned int i = 0; i < GetCount(); i++)
{
- wxString str( GetString( i ) );
-
+ wxString str(GetString(i));
+#if wxMAC_USE_CORE_GRAPHICS
+ wxCoord width, height ;
+ dc.GetTextExtent( str , &width, &height);
+ wLine = width ;
+#else
#if wxUSE_UNICODE
Point bounds = { 0, 0 } ;
SInt16 baseline ;
#else
wLine = ::TextWidth( str.c_str() , 0 , str.length() ) ;
#endif
-
+#endif
lbWidth = wxMax( lbWidth, wLine ) ;
}
// Add room for the popup arrow
lbWidth += 2 * lbHeight ;
-
+#if wxMAC_USE_CORE_GRAPHICS
+ wxCoord width, height ;
+ dc.GetTextExtent( wxT("X"), &width, &height);
+ int cx = width ;
+ lbHeight += 4;
+#else
// And just a bit more
int cx = ::TextWidth( "X" , 0 , 1 ) ;
+#endif
lbWidth += cx ;
}
projects / wxWidgets.git / blobdiff