/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/mac/carbon/choice.cpp
// Purpose: wxChoice
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE
-#include "wx/defs.h"
#include "wx/choice.h"
#include "wx/menu.h"
#include "wx/mac/uma.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
extern MenuHandle NewUniqueMenu() ;
const wxValidator& validator,
const wxString& name)
{
- m_macIsUserPane = FALSE ;
-
+ m_macIsUserPane = false ;
+
if ( !wxChoiceBase::Create(parent, id, pos, size, style, validator, name) )
return false;
Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
- m_peer = new wxMacControl() ;
- verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
- -12345 , false /* no variable width */ , 0 , 0 , 0 , *m_peer ) );
-
+ m_peer = new wxMacControl(this) ;
+ verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
+ -12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );
+
m_macPopUpMenuHandle = NewUniqueMenu() ;
m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
MacPostControlCreate(pos,size) ;
- // TODO wxCB_SORT
+
+#if !wxUSE_STL
+ if ( style & wxCB_SORT )
+ {
+ m_strings = wxArrayString(1) ; // autosort
+ }
+#endif
+
for ( int i = 0; i < n; i++ )
{
Append(choices[i]);
}
SetBestSize(size); // Needed because it is a wxControlWithItems
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
int wxChoice::DoAppend(const wxString& item)
{
- UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() );
- m_strings.Add( item ) ;
- m_datas.Add( NULL ) ;
- int index = m_strings.GetCount() - 1 ;
+#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
+ {
+ insertPoint = m_strings.end();
+ index = m_strings.size();
+ }
+
+ 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 ;
if (pos == GetCount())
return DoAppend(item);
- UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() );
+ UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() , pos );
m_strings.Insert( item, pos ) ;
m_datas.Insert( NULL, pos ) ;
DoSetItemClientData( pos , NULL ) ;
return m_strings.GetCount() ;
}
-int wxChoice::FindString(const wxString& s) const
+int wxChoice::FindString(const wxString& s, bool bCase ) const
{
- for( int i = 0 ; i < GetCount() ; i++ )
- {
- if ( GetString( i ).IsSameAs(s, FALSE) )
- return i ;
- }
- return wxNOT_FOUND ;
+ return m_strings.Index( s , bCase ) ;
}
void wxChoice::SetString(int n, const wxString& s)
{
- wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
-#if 0 // should do this, but no Insert() so far
- Delete(n);
- Insert(n + 1, s);
-#endif
+ m_strings[n] = s ;
+ // apple menu pos is 1-based
+ UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;
}
wxString wxChoice::GetString(int n) const
{
- wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""),
+ wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), wxEmptyString,
_T("wxChoice::GetString(): invalid index") );
return m_strings[n] ;
return (wxClientData *)DoGetItemClientData(n);
}
-wxInt32 wxChoice::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+wxInt32 wxChoice::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
int n = GetSelection();
}
return wxSize(lbWidth, lbHeight);
}
+
+#endif // wxUSE_CHOICE