X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2597135af78aa28fb582e788b5c4b1b1e4f7b9ba..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/mac/carbon/choice.cpp diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index bac3579f34..c395a39d19 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -1,176 +1,308 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.cpp +// Name: src/mac/carbon/choice.cpp // Purpose: wxChoice -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "choice.h" -#endif +#include "wx/wxprec.h" + +#if wxUSE_CHOICE -// For compilers that support precompilation, includes "wx.h". #include "wx/choice.h" -#include "wx/menu.h" -#include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) +#ifndef WX_PRECOMP + #include "wx/menu.h" + #include "wx/dcclient.h" #endif -short nextMenuId = 100 ; // wxMenu takes the lower ids +#include "wx/mac/uma.h" + +extern MenuHandle NewUniqueMenu() ; + +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) + wxChoice::~wxChoice() { - // DeleteMenu( m_macPopUpMenuId ) ; - DisposeMenu( m_macPopUpMenuHandle ) ; -} + if ( HasClientObjectData() ) + { + unsigned int i, max = GetCount(); + + for ( i = 0; i < max; ++i ) + delete GetClientObject( i ); + } -int wxChoice::GetCount() const { - return m_strings.Count() ; + // DeleteMenu( m_macPopUpMenuId ) ; + // DisposeMenu( m_macPopUpMenuHandle ) ; } -void wxChoice::SetString( int n , const wxString& s ) { - m_strings[n] = s ; +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) +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; - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; + if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) ) + return false; - m_macPopUpMenuHandle = NewMenu( 1 , "\pPopUp Menu" ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0 , - kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; - - m_macPopUpMenuHandle = NewMenu( 1 , "\pPopUp Menu" ) ; - SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ; - for ( int i = 0 ; i < n ; i++ ) - { - Str255 label; - wxMenuItem::MacBuildMenuString( label , NULL , NULL , choices[i] ,false); - AppendMenu( m_macPopUpMenuHandle , label ) ; - m_strings.Add( choices[i] ) ; - m_dataArray.Add( NULL ); - } - SetControlMinimum( m_macControl , 0 ) ; - SetControlMaximum( m_macControl , Number()) ; - if ( n > 0 ) - SetControlValue( m_macControl , 1 ) ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ); - MacPostControlCreate() ; + 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 ); - return TRUE; + m_macPopUpMenuHandle = NewUniqueMenu() ; + m_peer->SetData( 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; } -int wxChoice::DoAppend(const wxString& item) +// ---------------------------------------------------------------------------- +// adding/deleting items to/from the list +// ---------------------------------------------------------------------------- + +int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { - Str255 label; - wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false); - AppendMenu( m_macPopUpMenuHandle , label ) ; - m_strings.Add( item ) ; - m_dataArray.Add( NULL ); - return m_strings.Count() ; + const unsigned int numItems = items.GetCount(); + for( unsigned int i = 0; i < numItems; ++i, ++pos ) + { + 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); + } + + m_peer->SetMaximum( GetCount() ); + + return pos - 1; } -void *wxChoice::DoGetItemClientData(int N) const +void wxChoice::DoDeleteOneItem(unsigned int n) { - return (void *)m_dataArray[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::DoSetItemClientData( int N, void* Client_data ) +void wxChoice::DoClear() { - wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ; - - if ( m_dataArray.GetCount() > N ) - { - m_dataArray[N] = (char*) Client_data ; - } - else + for ( unsigned int i = 0 ; i < GetCount() ; i++ ) { - m_dataArray.Add( (char*) Client_data ) ; + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; } + + m_strings.Empty() ; + m_datas.Empty() ; + m_peer->SetMaximum( 0 ) ; } -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- +int wxChoice::GetSelection() const { - DoSetItemClientData(n, clientData); + return m_peer->GetValue() - 1 ; } -wxClientData* wxChoice::DoGetItemClientObject( int N ) const +void wxChoice::SetSelection( int n ) { - return (wxClientData *) DoGetItemClientData( N ) ; + m_peer->SetValue( n + 1 ) ; } -void wxChoice::Delete(int n) +// ---------------------------------------------------------------------------- +// string list functions +// ---------------------------------------------------------------------------- + +unsigned int wxChoice::GetCount() const { - ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ; - m_strings.Remove( n ) ; - m_dataArray.Remove( n ) ; - SetControlMaximum( m_macControl , Number()) ; + return m_strings.GetCount() ; } -void wxChoice::Clear() +int wxChoice::FindString( const wxString& s, bool bCase ) const { - for ( int i = 0 ; i < Number() ; i++ ) - { - ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ; - } - m_strings.Clear() ; - m_dataArray.Empty() ; - SetControlMaximum( m_macControl , Number()) ; +#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 ) ; } -int wxChoice::GetSelection() const +void wxChoice::SetString(unsigned int n, const wxString& s) { - return GetControlValue( m_macControl ) -1 ; + 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() ) ; } -void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +wxString wxChoice::GetString(unsigned int n) const { - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); - event.SetInt(GetSelection()); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - ProcessCommand(event); + 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::SetSelection(int n) +void * wxChoice::DoGetItemClientData(unsigned int n) const { - SetControlValue( m_macControl , n + 1 ) ; + wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") ); + + return (void *)m_datas[n]; } -int wxChoice::FindString(const wxString& s) const +wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - for( int i = 0 ; i < Number() ; i++ ) + 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 ) { - if ( GetString( i ) == s ) - return i ; + 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 -1; -} -wxString wxChoice::GetString(int n) const -{ - return m_strings[n] ; + return noErr ; } -void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags) +wxSize wxChoice::DoGetBestSize() const { - wxControl::SetSize( x,y,width,height,sizeFlags ) ; + int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults + int lbHeight = 20; + int wLine; + + SInt32 metric ; + + GetThemeMetric( kThemeMetricPopupButtonHeight , &metric ); + lbHeight = metric ; + + { + wxClientDC dc(const_cast(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 ; + } + + return wxSize( lbWidth, lbHeight ); } +#endif // wxUSE_CHOICE