X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2597135af78aa28fb582e788b5c4b1b1e4f7b9ba..0c32c93044babd3315029af529ab4348b103b036:/src/mac/carbon/choice.cpp diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp index bac3579f34..072badfdd2 100644 --- a/src/mac/carbon/choice.cpp +++ b/src/mac/carbon/choice.cpp @@ -13,7 +13,8 @@ #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,20 +23,12 @@ 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 ) ; -} - -int wxChoice::GetCount() const { - return m_strings.Count() ; -} - -void wxChoice::SetString( int n , const wxString& s ) { - m_strings[n] = s ; + // DisposeMenu( m_macPopUpMenuHandle ) ; } bool wxChoice::Create(wxWindow *parent, wxWindowID id, @@ -52,125 +45,188 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; - m_macPopUpMenuHandle = NewMenu( 1 , "\pPopUp Menu" ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0 , + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 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()) ; + 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( m_macControl , 1 ) ; + SetControlValue( (ControlHandle) m_macControl , 1 ) ; MacPostControlCreate() ; + 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 ) ; + AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ; m_strings.Add( item ) ; - m_dataArray.Add( NULL ); - return m_strings.Count() ; + m_datas.Add( NULL ) ; + int index = m_strings.GetCount() - 1 ; + DoSetItemClientData( index , NULL ) ; + SetControlMaximum( (ControlHandle) m_macControl , GetCount()) ; + return index ; } -void *wxChoice::DoGetItemClientData(int N) const +void wxChoice::Delete(int n) { - return (void *)m_dataArray[N]; -} + wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") ); -void wxChoice::DoSetItemClientData( int N, void* Client_data ) -{ - wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ; - - if ( m_dataArray.GetCount() > N ) - { - m_dataArray[N] = (char*) Client_data ; - } - else + if ( HasClientObjectData() ) { - m_dataArray.Add( (char*) Client_data ) ; + delete GetClientObject(n); } -} -void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) -{ - DoSetItemClientData(n, clientData); + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ; + m_strings.Remove( n ) ; + m_datas.RemoveAt( n ) ; + SetControlMaximum( (ControlHandle) m_macControl , GetCount()) ; } -wxClientData* wxChoice::DoGetItemClientObject( int N ) const +void wxChoice::Clear() { - return (wxClientData *) DoGetItemClientData( N ) ; -} + FreeData(); -void wxChoice::Delete(int n) -{ - ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ; - m_strings.Remove( n ) ; - m_dataArray.Remove( n ) ; - SetControlMaximum( m_macControl , Number()) ; + for ( int i = 0 ; i < GetCount() ; i++ ) + { + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; + } + m_strings.Empty() ; + m_datas.Empty() ; + SetControlMaximum( (ControlHandle) m_macControl , 0 ) ; } -void wxChoice::Clear() +void wxChoice::FreeData() { - for ( int i = 0 ; i < Number() ; i++ ) + if ( HasClientObjectData() ) { - ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ; - } - m_strings.Clear() ; - m_dataArray.Empty() ; - SetControlMaximum( m_macControl , Number()) ; + size_t count = GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + delete GetClientObject(n); + } + } } +// ---------------------------------------------------------------------------- +// selection +// ---------------------------------------------------------------------------- + int wxChoice::GetSelection() const { - return GetControlValue( m_macControl ) -1 ; + return GetControlValue( (ControlHandle) m_macControl ) -1 ; } -void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxChoice::SetSelection(int n) { - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId ); - event.SetInt(GetSelection()); - event.SetEventObject(this); - event.SetString(GetStringSelection()); - ProcessCommand(event); + SetControlValue( (ControlHandle) m_macControl , n + 1 ) ; } +// ---------------------------------------------------------------------------- +// string list functions +// ---------------------------------------------------------------------------- -void wxChoice::SetSelection(int n) +int wxChoice::GetCount() const { - SetControlValue( m_macControl , n + 1 ) ; + return m_strings.GetCount() ; } int wxChoice::FindString(const wxString& s) const { - for( int i = 0 ; i < Number() ; i++ ) + for( int i = 0 ; i < GetCount() ; i++ ) { - if ( GetString( i ) == s ) + if ( GetString( i ).IsSameAs(s, FALSE) ) return i ; } - return -1; + return wxNOT_FOUND ; } +void wxChoice::SetString(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 +} + + wxString wxChoice::GetString(int n) const { return m_strings[n] ; } -void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags) +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- + +void wxChoice::DoSetItemClientData( int n, void* clientData ) { - wxControl::SetSize( x,y,width,height,sizeFlags ) ; + 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 ) ; + } } +void *wxChoice::DoGetItemClientData(int N) const +{ + wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL, + "invalid index in wxChoice::GetClientData" ); + + return (void *)m_datas[N]; +} + +void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) +{ + DoSetItemClientData(n, clientData); +} + +wxClientData* wxChoice::DoGetItemClientObject( int n ) const +{ + return (wxClientData *)DoGetItemClientData(n); +} + +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); +} + +wxSize wxChoice::DoGetBestSize() const +{ + // TODO should modify this to take into account string length ala wxGTK + return wxSize(100,20); +} + +/* +void wxChoice::Command(wxCommandEvent & event) +{ + SetSelection (event.GetInt()); + ProcessCommand (event); +} +*/