X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2597135af78aa28fb582e788b5c4b1b1e4f7b9ba..03c4c72be65175f847770e183d3333862878bc67:/src/mac/carbon/choice.cpp?ds=sidebyside diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index bac3579f34..1a617ef6a5 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -1,19 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// // Name: 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 -// For compilers that support precompilation, includes "wx.h". +#include "wx/defs.h" #include "wx/choice.h" #include "wx/menu.h" #include "wx/mac/uma.h" @@ -22,155 +22,278 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) #endif -short nextMenuId = 100 ; // wxMenu takes the lower ids +extern MenuHandle NewUniqueMenu() ; wxChoice::~wxChoice() { - // DeleteMenu( m_macPopUpMenuId ) ; - DisposeMenu( m_macPopUpMenuHandle ) ; -} + if ( HasClientObjectData() ) + { + size_t i, max = GetCount(); -int wxChoice::GetCount() const { - return m_strings.Count() ; -} + for ( i = 0; i < max; ++i ) + delete GetClientObject(i); + } -void wxChoice::SetString( int n , const wxString& s ) { - m_strings[n] = s ; + // DeleteMenu( m_macPopUpMenuId ) ; + // DisposeMenu( m_macPopUpMenuHandle ) ; } bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], - long style, + const wxArrayString& choices, + long style, const wxValidator& validator, const wxString& name) { + wxCArrayString chs(choices); - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; + return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(), + style, validator, name); +} - 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 ) ; +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; - MacPostControlCreate() ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , -12345 , 0 , + kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; - return TRUE; + m_macPopUpMenuHandle = NewUniqueMenu() ; + SetControlData( (ControlRef) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ; + SetControl32BitMinimum( (ControlRef) m_macControl , 0 ) ; + SetControl32BitMaximum( (ControlRef) m_macControl , 0) ; + if ( n > 0 ) + SetControl32BitValue( (ControlRef) m_macControl , 1 ) ; + MacPostControlCreate(pos,size) ; + // TODO wxCB_SORT + for ( int i = 0; i < n; i++ ) + { + Append(choices[i]); + } + return TRUE; } +// ---------------------------------------------------------------------------- +// adding/deleting items to/from the list +// ---------------------------------------------------------------------------- int wxChoice::DoAppend(const wxString& item) { - 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() ; + 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 ) ; + SetControl32BitMaximum( (ControlRef) m_macControl , GetCount()) ; + return index ; } -void *wxChoice::DoGetItemClientData(int N) const +int wxChoice::DoInsert(const wxString& item, int pos) { - return (void *)m_dataArray[N]; + wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list")); + wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index")); + + if (pos == GetCount()) + return DoAppend(item); + + UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() ); + m_strings.Insert( item, pos ) ; + m_datas.Insert( NULL, pos ) ; + DoSetItemClientData( pos , NULL ) ; + SetControl32BitMaximum( (ControlRef) m_macControl , pos) ; + return pos ; } -void wxChoice::DoSetItemClientData( int N, void* Client_data ) +void wxChoice::Delete(int n) { - wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ; - - if ( m_dataArray.GetCount() > N ) - { - m_dataArray[N] = (char*) Client_data ; + wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") ); + if ( HasClientObjectData() ) + { + delete GetClientObject(n); } - else + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ; + m_strings.RemoveAt( n ) ; + m_datas.RemoveAt( n ) ; + SetControl32BitMaximum( (ControlRef) m_macControl , GetCount()) ; +} + +void wxChoice::Clear() +{ + FreeData(); + for ( int i = 0 ; i < GetCount() ; i++ ) { - m_dataArray.Add( (char*) Client_data ) ; + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; } + m_strings.Empty() ; + m_datas.Empty() ; + SetControl32BitMaximum( (ControlRef) m_macControl , 0 ) ; } -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) +void wxChoice::FreeData() { - DoSetItemClientData(n, clientData); + if ( HasClientObjectData() ) + { + size_t count = GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + delete GetClientObject(n); + } + } } -wxClientData* wxChoice::DoGetItemClientObject( int N ) const +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- +int wxChoice::GetSelection() const { - return (wxClientData *) DoGetItemClientData( N ) ; + return GetControl32BitValue( (ControlRef) m_macControl ) -1 ; } -void wxChoice::Delete(int n) +void wxChoice::SetSelection(int n) { - ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ; - m_strings.Remove( n ) ; - m_dataArray.Remove( n ) ; - SetControlMaximum( m_macControl , Number()) ; + SetControl32BitValue( (ControlRef) m_macControl , n + 1 ) ; } -void wxChoice::Clear() +// ---------------------------------------------------------------------------- +// string list functions +// ---------------------------------------------------------------------------- + +int wxChoice::GetCount() const { - for ( int i = 0 ; i < Number() ; i++ ) + return m_strings.GetCount() ; +} + +int wxChoice::FindString(const wxString& s) const +{ + for( int i = 0 ; i < GetCount() ; i++ ) { - ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ; - } - m_strings.Clear() ; - m_dataArray.Empty() ; - SetControlMaximum( m_macControl , Number()) ; + if ( GetString( i ).IsSameAs(s, FALSE) ) + return i ; + } + return wxNOT_FOUND ; } -int wxChoice::GetSelection() const +void wxChoice::SetString(int n, const wxString& s) { - return GetControlValue( m_macControl ) -1 ; + 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 } -void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +wxString wxChoice::GetString(int n) const { - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); - event.SetInt(GetSelection()); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - ProcessCommand(event); + wxCHECK_MSG( n >= 0 && (size_t)n < m_strings.GetCount(), _T(""), + _T("wxChoice::GetString(): invalid index") ); + + return m_strings[n] ; } +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- +void wxChoice::DoSetItemClientData( int n, void* clientData ) +{ + wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(), + wxT("invalid index in wxChoice::SetClientData") ); -void wxChoice::SetSelection(int n) + m_datas[n] = (char*) clientData ; +} + +void *wxChoice::DoGetItemClientData(int n) const { - SetControlValue( m_macControl , n + 1 ) ; + wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL, + wxT("invalid index in wxChoice::GetClientData") ); + return (void *)m_datas[n]; } -int wxChoice::FindString(const wxString& s) const +void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) { - for( int i = 0 ; i < Number() ; i++ ) - { - if ( GetString( i ) == s ) - return i ; - } - return -1; + DoSetItemClientData(n, clientData); } -wxString wxChoice::GetString(int n) const +wxClientData* wxChoice::DoGetItemClientObject( int n ) const { - return m_strings[n] ; + return (wxClientData *)DoGetItemClientData(n); } -void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags) +void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) { - wxControl::SetSize( x,y,width,height,sizeFlags ) ; + 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 ... + 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); + } } +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 ); + 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 ) ; + } + // Find the widest line + for(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); + } + // Add room for the popup arrow + lbWidth += 2 * lbHeight ; + // And just a bit more + int cx = ::TextWidth( "X" , 0 , 1 ) ; + lbWidth += cx ; + + } + return wxSize(lbWidth, lbHeight); +}