X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21fd55291b631eae9ccfd78866616aca6e573ebe..0c1cc9483ecba053bc9a0983a4a8d48898e334f2:/src/mac/carbon/choice.cpp?ds=sidebyside diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index c0c21a5377..c395a39d19 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -1,166 +1,189 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.cpp +// Name: src/mac/carbon/choice.cpp // Purpose: wxChoice // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// 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) +#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() { if ( HasClientObjectData() ) { - size_t i, max = GetCount(); + unsigned int i, max = GetCount(); for ( i = 0; i < max; ++i ) - delete GetClientObject(i); + delete GetClientObject( i ); } - // DeleteMenu( m_macPopUpMenuId ) ; + // 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) +bool wxChoice::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name ) { - wxCArrayString chs(choices); + if ( !Create( parent, id, pos, size, 0, NULL, style, validator, name ) ) + return false; + + Append( choices ); + + if ( !choices.empty() ) + SetSelection( 0 ); + + SetInitialSize( size ); - return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), - style, validator, name); + 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 ; - - if ( !wxChoiceBase::Create(parent, id, pos, size, style, validator, name) ) + m_macIsUserPane = false; + + if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) ) return false; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + 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 ) ; + 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_macPopUpMenuHandle = NewUniqueMenu() ; m_peer->SetData( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ; - m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ; - MacPostControlCreate(pos,size) ; - // TODO wxCB_SORT - for ( int i = 0; i < n; i++ ) - { - Append(choices[i]); - } - SetBestSize(size); // Needed because it is a wxControlWithItems - return TRUE; + 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) -{ - UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() ); - m_strings.Add( item ) ; - m_datas.Add( NULL ) ; - int index = m_strings.GetCount() - 1 ; - DoSetItemClientData( index , NULL ) ; - m_peer->SetMaximum( GetCount() ) ; - return index ; -} -int wxChoice::DoInsert(const wxString& item, int pos) +int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { - wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); - wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index")); + const unsigned int numItems = items.GetCount(); + for( unsigned int i = 0; i < numItems; ++i, ++pos ) + { + unsigned int idx; - if (pos == GetCount()) - return DoAppend(item); +#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 ); + } - UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() ); - m_strings.Insert( item, pos ) ; - m_datas.Insert( NULL, pos ) ; - DoSetItemClientData( pos , NULL ) ; - m_peer->SetMaximum( GetCount() ) ; - return pos ; + 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::Delete(int n) +void wxChoice::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") ); + wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") ); + if ( HasClientObjectData() ) - { - delete GetClientObject(n); - } - ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ; + delete GetClientObject( n ); + + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 ) ; m_strings.RemoveAt( n ) ; m_datas.RemoveAt( n ) ; m_peer->SetMaximum( GetCount() ) ; } -void wxChoice::Clear() +void wxChoice::DoClear() { - FreeData(); - for ( int i = 0 ; i < GetCount() ; i++ ) + for ( unsigned int i = 0 ; i < GetCount() ; i++ ) { ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; } + m_strings.Empty() ; m_datas.Empty() ; 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 // ---------------------------------------------------------------------------- int wxChoice::GetSelection() const { - return m_peer->GetValue() -1 ; + return m_peer->GetValue() - 1 ; } -void wxChoice::SetSelection(int n) +void wxChoice::SetSelection( int n ) { m_peer->SetValue( n + 1 ) ; } @@ -169,34 +192,35 @@ void wxChoice::SetSelection(int n) // 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("wxChoice::SetString() not yet implemented")); -#if 0 // should do this, but no Insert() so far - Delete(n); - Insert(n + 1, s); -#endif + 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(int n) const +wxString wxChoice::GetString(unsigned int n) const { - wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""), - _T("wxChoice::GetString(): invalid index") ); + wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") ); return m_strings[n] ; } @@ -204,47 +228,40 @@ wxString wxChoice::GetString(int n) const // ---------------------------------------------------------------------------- // client data // ---------------------------------------------------------------------------- -void wxChoice::DoSetItemClientData( int n, void* clientData ) +void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(), - wxT("invalid index in wxChoice::SetClientData") ); + wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") ); - m_datas[n] = (char*) clientData ; + m_datas[n] = (char*)clientData ; } -void *wxChoice::DoGetItemClientData(int n) const +void * wxChoice::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL, - wxT("invalid index in wxChoice::GetClientData") ); - return (void *)m_datas[n]; -} + wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") ); -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - DoSetItemClientData(n, clientData); + return (void *)m_datas[n]; } -wxClientData* wxChoice::DoGetItemClientObject( int n ) const +wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - return (wxClientData *)DoGetItemClientData(n); -} + wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); -wxInt32 wxChoice::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) -{ - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); - int n = GetSelection(); // 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); + event.SetString( GetStringSelection() ); + event.SetEventObject( this ); + if ( HasClientObjectData() ) - event.SetClientObject( GetClientObject(n) ); + event.SetClientObject( GetClientObject( n ) ); else if ( HasClientUntypedData() ) - event.SetClientData( GetClientData(n) ); - ProcessCommand(event); + event.SetClientData( GetClientData( n ) ); + + ProcessCommand( event ); } + return noErr ; } @@ -253,49 +270,39 @@ wxSize wxChoice::DoGetBestSize() const int lbWidth = GetCount() > 0 ? 20 : 100; // some defaults int lbHeight = 20; int wLine; -#if TARGET_CARBON - long metric ; - GetThemeMetric(kThemeMetricPopupButtonHeight , &metric ); + + SInt32 metric ; + + GetThemeMetric( kThemeMetricPopupButtonHeight , &metric ); lbHeight = metric ; -#endif + { - wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ; - if ( m_font.Ok() ) - { - ::TextFont( m_font.MacGetFontNum() ) ; - ::TextSize( m_font.MacGetFontSize() ) ; - ::TextFace( m_font.MacGetFontStyle() ) ; - } - else - { - ::TextFont( kFontIDMonaco ) ; - ::TextSize( 9 ); - ::TextFace( 0 ) ; - } + wxClientDC dc(const_cast(this)); + // Find the widest line - for(int i = 0; i < GetCount(); i++) { + for(unsigned int i = 0; i < GetCount(); i++) + { wxString str(GetString(i)); - #if wxUSE_UNICODE - Point bounds={0,0} ; - SInt16 baseline ; - ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) , - kThemeCurrentPortFont, - kThemeStateActive, - false, - &bounds, - &baseline ); - wLine = bounds.h ; - #else - wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ; - #endif - lbWidth = wxMax(lbWidth, wLine); + + wxCoord width, height ; + dc.GetTextExtent( str , &width, &height); + wLine = width ; + + lbWidth = wxMax( lbWidth, wLine ) ; } + // Add room for the popup arrow lbWidth += 2 * lbHeight ; - // And just a bit more - int cx = ::TextWidth( "X" , 0 , 1 ) ; - lbWidth += cx ; + wxCoord width, height ; + dc.GetTextExtent( wxT("X"), &width, &height); + int cx = width ; + lbHeight += 4; + + lbWidth += cx ; } - return wxSize(lbWidth, lbHeight); + + return wxSize( lbWidth, lbHeight ); } + +#endif // wxUSE_CHOICE