X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..94311eef78b66304c9a2f78bcbdd396c798f19a6:/src/mac/choice.cpp diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp index a584d5303f..ac29f3125b 100644 --- a/src/mac/choice.cpp +++ b/src/mac/choice.cpp @@ -8,18 +8,30 @@ // Copyright: (c) AUTHOR // 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" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) #endif +extern MenuHandle NewUniqueMenu() ; +wxChoice::~wxChoice() +{ + if ( HasClientObjectData() ) + { + size_t 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, @@ -28,92 +40,193 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - SetName(name); - SetValidator(validator); - m_noStrings = n; - m_windowStyle = style; - - if (parent) parent->AddChild(this); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - // TODO: create choice control - return FALSE; + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; + 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) ; + SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ; + SetControl32BitMaximum( (ControlHandle) m_macControl , 0) ; + if ( n > 0 ) + SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ; + MacPostControlCreate() ; + for ( int i = 0; i < n; i++ ) + { + Append(choices[i]); + } + return TRUE; } - -void wxChoice::Append(const wxString& item) +// ---------------------------------------------------------------------------- +// adding/deleting items to/from the list +// ---------------------------------------------------------------------------- +int wxChoice::DoAppend(const wxString& item) { - // TODO - m_noStrings ++; + UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item); + m_strings.Add( item ) ; + m_datas.Add( NULL ) ; + int index = m_strings.GetCount() - 1 ; + DoSetItemClientData( index , NULL ) ; + SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ; + return index ; } - void wxChoice::Delete(int n) { - // TODO - m_noStrings --; + wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") ); + if ( HasClientObjectData() ) + { + delete GetClientObject(n); + } + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ; + m_strings.Remove( n ) ; + m_datas.RemoveAt( n ) ; + SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ; } - void wxChoice::Clear() { - // TODO - m_noStrings = 0; + FreeData(); + for ( int i = 0 ; i < GetCount() ; i++ ) + { + ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ; + } + m_strings.Empty() ; + m_datas.Empty() ; + SetControl32BitMaximum( (ControlHandle) m_macControl , 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 { - // TODO - return 0; + return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ; } - void wxChoice::SetSelection(int n) { - // TODO + SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ; +} +// ---------------------------------------------------------------------------- +// string list functions +// ---------------------------------------------------------------------------- +int wxChoice::GetCount() const +{ + return m_strings.GetCount() ; } - int wxChoice::FindString(const wxString& s) const { - // TODO - return 0; + for( int i = 0 ; i < GetCount() ; i++ ) + { + if ( GetString( i ).IsSameAs(s, FALSE) ) + return i ; + } + 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 { - // TODO - return wxString(""); + return m_strings[n] ; } - -void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) +// ---------------------------------------------------------------------------- +// client data +// ---------------------------------------------------------------------------- +void wxChoice::DoSetItemClientData( int n, void* clientData ) { - // TODO + wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(), + "invalid index in wxChoice::SetClientData" ); + + m_datas[n] = (char*) clientData ; } - -wxString wxChoice::GetStringSelection () const +void *wxChoice::DoGetItemClientData(int n) const { - int sel = GetSelection (); - if (sel > -1) - return wxString(this->GetString (sel)); - else - return wxString(""); + wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL, + "invalid index in wxChoice::GetClientData" ); + return (void *)m_datas[n]; } - -bool wxChoice::SetStringSelection (const wxString& s) +void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData ) { - int sel = FindString (s); - if (sel > -1) - { - SetSelection (sel); - return TRUE; - } - else - return FALSE; + DoSetItemClientData(n, clientData); } - -void wxChoice::Command(wxCommandEvent & event) +wxClientData* wxChoice::DoGetItemClientObject( int n ) const { - SetSelection (event.GetInt()); - ProcessCommand (event); + return (wxClientData *)DoGetItemClientData(n); +} +void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +{ + 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 = 100; // some defaults + int lbHeight = 20; + int wLine; +#if TARGET_CARBON + long metric ; + GetThemeMetric(kThemeMetricPopupButtonHeight , &metric ); + lbHeight = metric ; +#endif + { + wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; + Rect drawRect ; + wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ; + if ( font ) + { + ::TextFont( font->m_macFontNum ) ; + ::TextSize( short(font->m_macFontSize) ) ; + ::TextFace( font->m_macFontStyle ) ; + } + else + { + ::TextFont( kFontIDMonaco ) ; + ::TextSize( 9 ); + ::TextFace( 0 ) ; + } + // Find the widest line + for(int i = 0; i < GetCount(); i++) { + wxString str(GetString(i)); + wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ; + lbWidth = wxMax(lbWidth, wLine); + } + // Add room for the popup arrow + lbWidth += 2 * lbHeight ; + // And just a bit more + int cy = 12 ; + int cx = ::TextWidth( "X" , 0 , 1 ) ; + lbWidth += cx ; + + } + return wxSize(lbWidth, lbHeight); } -