X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..0c1cc9483ecba053bc9a0983a4a8d48898e334f2:/src/mac/carbon/choice.cpp diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index f8068ff829..c395a39d19 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -1,232 +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" -#include "wx/defs.h" +#if wxUSE_CHOICE #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 +#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 ); + } + + // 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) +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_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 , - kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; - - m_macPopUpMenuHandle = NewUniqueMenu() ; - SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ; - SetControlMinimum( (ControlHandle) m_macControl , 0 ) ; - SetControlMaximum( (ControlHandle) m_macControl , 0) ; - if ( n > 0 ) - SetControlValue( (ControlHandle) 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 ); - for ( int i = 0; i < n; i++ ) - { - Append(choices[i]); - } - 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; } // ---------------------------------------------------------------------------- // adding/deleting items to/from the list // ---------------------------------------------------------------------------- -int wxChoice::DoAppend(const wxString& item) +int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { - Str255 label; - wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false); - AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ; - m_strings.Add( item ) ; - m_datas.Add( NULL ) ; - int index = m_strings.GetCount() - 1 ; - DoSetItemClientData( index , NULL ) ; - SetControlMaximum( (ControlHandle) m_macControl , GetCount()) ; - return index ; -} + const unsigned int numItems = items.GetCount(); + for( unsigned int i = 0; i < numItems; ++i, ++pos ) + { + unsigned int idx; -void wxChoice::Delete(int n) -{ - wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") ); +#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 ( HasClientObjectData() ) - { - delete GetClientObject(n); + UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ), + items[i], + GetFont().GetEncoding(), + idx); + m_datas.Insert( NULL, idx ); + AssignNewItemClientData(idx, clientData, i, type); } - ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ; - m_strings.Remove( n ) ; - m_datas.RemoveAt( n ) ; - SetControlMaximum( (ControlHandle) m_macControl , GetCount()) ; + m_peer->SetMaximum( GetCount() ); + + return pos - 1; } -void wxChoice::Clear() +void wxChoice::DoDeleteOneItem(unsigned int n) { - Free(); + wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") ); - for ( int i = 0 ; i < GetCount() ; i++ ) - { - ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; - } - m_strings.Empty() ; - m_datas.Empty() ; - SetControlMaximum( (ControlHandle) m_macControl , 0 ) ; + 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::Free() +void wxChoice::DoClear() { - if ( HasClientObjectData() ) + for ( unsigned int i = 0 ; i < GetCount() ; i++ ) { - size_t count = GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - delete GetClientObject(n); - } + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; } + + m_strings.Empty() ; + m_datas.Empty() ; + m_peer->SetMaximum( 0 ) ; } // ---------------------------------------------------------------------------- // selection // ---------------------------------------------------------------------------- - int wxChoice::GetSelection() const { - return GetControlValue( (ControlHandle) m_macControl ) -1 ; + return m_peer->GetValue() - 1 ; } -void wxChoice::SetSelection(int n) +void wxChoice::SetSelection( int n ) { - SetControlValue( (ControlHandle) m_macControl , n + 1 ) ; + m_peer->SetValue( n + 1 ) ; } // ---------------------------------------------------------------------------- // string list functions // ---------------------------------------------------------------------------- -int wxChoice::GetCount() const +unsigned int wxChoice::GetCount() const { 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 ; +#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) { - wxFAIL_MSG(wxT("not implemented")); + wxCHECK_RET( IsValid(n), wxT("wxChoice::SetString(): invalid index") ); -#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 +wxString wxChoice::GetString(unsigned int n) const { - return m_strings[n] ; + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") ); + + return m_strings[n] ; } // ---------------------------------------------------------------------------- // client data // ---------------------------------------------------------------------------- - -void wxChoice::DoSetItemClientData( int n, void* clientData ) +void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( n >= 0 && n < m_datas.GetCount(), - "invalid index in wxChoice::SetClientData" ); - wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ; - - if ( m_datas.GetCount() > n ) - { - m_datas[n] = (char*) clientData ; - } - else - { - m_datas.Add( (char*) 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( N >= 0 && N < m_datas.GetCount(), NULL, - "invalid index in wxChoice::GetClientData" ); + wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") ); - return (void *)m_datas[N]; + return (void *)m_datas[n]; } -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) +wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - DoSetItemClientData(n, clientData); -} + wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); -wxClientData* wxChoice::DoGetItemClientObject( int n ) const -{ - return (wxClientData *)DoGetItemClientData(n); -} + // 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 ); -void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) -{ - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); - event.SetInt(GetSelection()); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - ProcessCommand(event); + if ( HasClientObjectData() ) + event.SetClientObject( GetClientObject( n ) ); + else if ( HasClientUntypedData() ) + event.SetClientData( GetClientData( n ) ); + + ProcessCommand( event ); + } + + return noErr ; } wxSize wxChoice::DoGetBestSize() const { - // TODO should modify this to take into account string length ala wxGTK - return wxSize(100,20); -} + int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults + int lbHeight = 20; + int wLine; -/* -void wxChoice::Command(wxCommandEvent & event) -{ - SetSelection (event.GetInt()); - ProcessCommand (event); + 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