/////////////////////////////////////////////////////////////////////////////
-// Name: src/mac/carbon/choice.cpp
+// Name: src/osx/carbon/choice.cpp
// Purpose: wxChoice
// Author: Stefan Csomor
// Modified by:
#include "wx/dcclient.h"
#endif
-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"
-extern MenuHandle NewUniqueMenu() ;
+// adapt the number offset (mac menu are 1 based)
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
-
-wxChoice::~wxChoice()
+class wxMacChoiceCarbonControl : public wxMacControl
{
- if ( HasClientObjectData() )
+public :
+ wxMacChoiceCarbonControl( wxWindowMac* peer ) : wxMacControl( peer )
{
- unsigned int i, max = GetCount();
-
- for ( i = 0; i < max; ++i )
- delete GetClientObject( i );
}
-
- // DeleteMenu( m_macPopUpMenuId ) ;
- // DisposeMenu( m_macPopUpMenuHandle ) ;
-}
-
-bool wxChoice::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- const wxArrayString& choices,
- long style,
- const wxValidator& validator,
- const wxString& name )
-{
- if ( !Create( parent, id, pos, size, 0, NULL, style, validator, name ) )
- return false;
-
- Append( choices );
-
- if ( !choices.empty() )
- SetSelection( 0 );
-
- SetInitialSize( size );
-
- return true;
-}
-
-bool wxChoice::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- int n,
- const wxString choices[],
- long style,
- const wxValidator& validator,
- const wxString& name )
-{
- 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( this ) ;
- OSStatus err = CreatePopupButtonControl(
- MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
- -12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() );
- verify_noerr( err );
-
- m_macPopUpMenuHandle = NewUniqueMenu() ;
- m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
- m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 );
- MacPostControlCreate( pos, size );
-
-#if !wxUSE_STL
- if ( style & wxCB_SORT )
- // autosort
- m_strings = wxArrayString( 1 );
-#endif
-
- Append(n, choices);
-
- // Set the first item as being selected
- if (n > 0)
- SetSelection( 0 );
-
- // Needed because it is a wxControlWithItems
- SetInitialSize( size );
-
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// adding/deleting items to/from the list
-// ----------------------------------------------------------------------------
-
-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 )
+
+ void SetValue(wxInt32 v)
{
- unsigned int idx;
-
-#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 );
- }
-
- UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ),
- items[i],
- GetFont().GetEncoding(),
- idx);
- m_datas.Insert( NULL, idx );
- AssignNewItemClientData(idx, clientData, i, type);
+ wxMacControl::SetValue( v + 1 );
}
-
- m_peer->SetMaximum( GetCount() );
-
- return pos - 1;
-}
-
-void wxChoice::DoDeleteOneItem(unsigned int n)
-{
- wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") );
-
- if ( HasClientObjectData() )
- delete GetClientObject( n );
-
- ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 ) ;
- m_strings.RemoveAt( n ) ;
- m_datas.RemoveAt( n ) ;
- m_peer->SetMaximum( GetCount() ) ;
-}
-
-void wxChoice::DoClear()
-{
- for ( unsigned int i = 0 ; i < GetCount() ; i++ )
+
+ wxInt32 GetValue()
{
- ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+ return wxMacControl::GetValue() - 1;
}
+ };
- m_strings.Empty() ;
- m_datas.Empty() ;
- m_peer->SetMaximum( 0 ) ;
-}
-
-// ----------------------------------------------------------------------------
-// selection
-// ----------------------------------------------------------------------------
-int wxChoice::GetSelection() const
-{
- return m_peer->GetValue() - 1 ;
-}
-
-void wxChoice::SetSelection( int n )
+wxWidgetImplType* wxWidgetImpl::CreateChoice( wxWindowMac* wxpeer,
+ wxWindowMac* parent,
+ wxWindowID id,
+ wxMenu* menu,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ long extraStylew)
{
- m_peer->SetValue( n + 1 ) ;
-}
-
-// ----------------------------------------------------------------------------
-// string list functions
-// ----------------------------------------------------------------------------
+ Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size );
-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(unsigned int n, const wxString& s)
-{
- wxCHECK_RET( IsValid(n), wxT("wxChoice::SetString(): invalid index") );
-
- m_strings[n] = s ;
-
- // apple menu pos is 1-based
- UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;
-}
-
-wxString wxChoice::GetString(unsigned int n) const
-{
- wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") );
-
- return m_strings[n] ;
-}
-
-// ----------------------------------------------------------------------------
-// client data
-// ----------------------------------------------------------------------------
-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];
-}
-
-wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
-{
- 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 );
- }
-
- return noErr ;
-}
-
-wxSize wxChoice::DoGetBestSize() const
-{
- int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults
- int lbHeight = 20;
- int wLine;
-
- SInt32 metric ;
-
- GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
- lbHeight = metric ;
-
- {
- 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 ;
- lbHeight += 4;
-
- lbWidth += cx ;
- }
+ wxMacControl* peer = new wxMacChoiceCarbonControl( wxpeer ) ;
+ OSStatus err = CreatePopupButtonControl(
+ MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
+ -12345 , false /* no variable width */ , 0 , 0 , 0 , peer->GetControlRefAddr() );
+ verify_noerr( err );
- return wxSize( lbWidth, lbHeight );
+ peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) menu->GetHMenu() ) ;
+ return peer;
}
#endif // wxUSE_CHOICE