X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa61d3525370a9b9fa8c797d9b7f89d96994db5f..b1294ada8e87725409f290328da02306e5c8f4eb:/src/mac/carbon/combobxc.cpp?ds=sidebyside diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp index 21d3953922..670cbf7b6d 100644 --- a/src/mac/carbon/combobxc.cpp +++ b/src/mac/carbon/combobxc.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/combobox.cpp -// Purpose: wxComboBox class +// Name: src/mac/carbon/combobxc.cpp +// Purpose: wxComboBox class using HIView ComboBox // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 @@ -12,8 +12,12 @@ #include "wx/wxprec.h" #include "wx/combobox.h" -#include "wx/button.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/button.h" + #include "wx/menu.h" +#endif + #include "wx/mac/uma.h" #if TARGET_API_MAC_OSX #ifndef __HIVIEW__ @@ -23,34 +27,32 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -// composite combobox implementation by Dan "Bud" Keith bud@otsys.com - #if TARGET_API_MAC_OSX #define USE_HICOMBOBOX 1 //use hi combobox define #else #define USE_HICOMBOBOX 0 #endif -static int nextPopUpMenuId = 1000 ; +static int nextPopUpMenuId = 1000; MenuHandle NewUniqueMenu() { - MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; - nextPopUpMenuId++ ; - return handle ; + MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ); + nextPopUpMenuId++; + return handle; } #if USE_HICOMBOBOX static const EventTypeSpec eventList[] = { { kEventClassTextField , kEventTextAccepted } , -} ; +}; static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - OSStatus result = eventNotHandledErr ; - wxComboBox* cb = (wxComboBox*) data ; + OSStatus result = eventNotHandledErr; + wxComboBox* cb = (wxComboBox*) data; - wxMacCarbonEvent cEvent( event ) ; + wxMacCarbonEvent cEvent( event ); switch( cEvent.GetClass() ) { @@ -65,17 +67,17 @@ static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler , event.SetEventObject( cb ); cb->GetEventHandler()->ProcessEvent( event ); } - break ; + break; default : - break ; + break; } - break ; + break; default : - break ; + break; } - return result ; + return result; } DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacComboBoxEventHandler ) @@ -145,20 +147,16 @@ protected: // This will invoke the dialog default action, such // as the clicking the default button. - wxWindow *parent = GetParent(); - while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) { - parent = parent->GetParent() ; - } - if ( parent && parent->GetDefaultItem() ) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw && tlw->GetDefaultItem() ) { - wxButton *def = wxDynamicCast(parent->GetDefaultItem(), - wxButton); + wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton); if ( def && def->IsEnabled() ) { wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); event.SetEventObject(def); def->Command(event); - return ; + return; } } @@ -201,9 +199,9 @@ protected: } virtual wxSize DoGetBestSize() const { - wxSize sz = wxChoice::DoGetBestSize() ; - sz.x = POPUPWIDTH ; - return sz ; + wxSize sz = wxChoice::DoGetBestSize(); + sz.x = POPUPWIDTH; + return sz; } private: @@ -218,9 +216,6 @@ END_EVENT_TABLE() wxComboBox::~wxComboBox() { - // delete client objects - FreeData(); - // delete the controls now, don't leave them alive even though they would // still be eventually deleted by our parent - but it will be too late, the // user code expects them to be gone now @@ -354,7 +349,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, m_text = NULL; m_choice = NULL; #if USE_HICOMBOBOX - m_macIsUserPane = false ; + m_macIsUserPane = false; #endif if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style , wxDefaultValidator, name) ) @@ -362,7 +357,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, return false; } #if USE_HICOMBOBOX - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ); HIRect hiRect; hiRect.origin.x = 20; //bounds.left; @@ -377,33 +372,28 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, //hiRect.size.height = bounds.bottom - bounds.top; //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom); //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height); - m_peer = new wxMacControl(this) ; - verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, *m_peer ) ); + m_peer = new wxMacControl(this); + verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, m_peer->GetControlRefAddr() ) ); - SetControl32BitMinimum( *m_peer , 0 ) ; - SetControl32BitMaximum( *m_peer , 100) ; + m_peer->SetMinimum( 0 ); + m_peer->SetMaximum( 100); if ( n > 0 ) - SetControl32BitValue( *m_peer , 1 ) ; + m_peer->SetValue( 1 ); - MacPostControlCreate(pos,size) ; + MacPostControlCreate(pos,size); - for ( int i = 0 ; i < n ; i++ ) - { - DoAppend( choices[ i ] ); - } + Append( choices[ i ] ); - HIViewSetVisible( *m_peer, true ); + HIViewSetVisible( m_peer->GetControlRef(), true ); SetSelection(0); - EventHandlerRef comboEventHandler ; - InstallControlEventHandler( *m_peer, GetwxMacComboBoxEventHandlerUPP(), + EventHandlerRef comboEventHandler; + InstallControlEventHandler( m_peer->GetControlRef(), GetwxMacComboBoxEventHandlerUPP(), GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&comboEventHandler); #else m_choice = new wxComboBoxChoice(this, style ); - - m_choice = new wxComboBoxChoice(this, style ); - m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ; + m_choice->SetMinSize( wxSize( POPUPWIDTH , POPUPHEIGHT ) ); wxSize csize = size; if ( style & wxCB_READONLY ) @@ -414,17 +404,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, { m_text = new wxComboBoxText(this); if ( size.y == wxDefaultCoord ) { - csize.y = m_text->GetSize().y ; + csize.y = m_text->GetSize().y; } } DoSetSize(pos.x, pos.y, csize.x, csize.y); - for ( int i = 0 ; i < n ; i++ ) - { - m_choice->DoAppend( choices[ i ] ); - } - SetBestSize(csize); // Needed because it is a wxControlWithItems + m_choice->Append( n, choices ); + SetInitialSize(csize); // Needed because it is a wxControlWithItems #endif return true; @@ -434,7 +421,7 @@ wxString wxComboBox::GetValue() const { #if USE_HICOMBOBOX CFStringRef myString; - HIComboBoxCopyTextItemAtIndex( *m_peer, (CFIndex)GetSelection(), &myString ); + HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString ); return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString(); #else wxString result; @@ -460,9 +447,9 @@ void wxComboBox::SetValue(const wxString& value) int s = FindString (value); if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) ) { - m_choice->Append(value) ; + m_choice->Append(value); } - SetStringSelection( value ) ; + SetStringSelection( value ); #endif } @@ -549,28 +536,26 @@ void wxComboBox::SetSelection(long from, long to) // TODO } -int wxComboBox::DoAppend(const wxString& item) +int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type) { #if USE_HICOMBOBOX - CFIndex outIndex; - HIComboBoxAppendTextItem( *m_peer, wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex ); - //SetControl32BitMaximum( *m_peer, GetCount() ); - return (int) outIndex; -#else - return m_choice->DoAppend( item ) ; -#endif -} - -int wxComboBox::DoInsert(const wxString& item, unsigned int pos) -{ -#if USE_HICOMBOBOX - HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) ); + const unsigned int count = items.GetCount(); + for ( unsigned int i = 0; i < count; ++i, ++pos ) + { + HIComboBoxInsertTextItemAtIndex(m_peer->GetControlRef(), + (CFIndex)pos, + wxMacCFStringHolder(items[i], + m_font.GetEncoding())); + AssignNewItemClientData(pos, clientData, i, type); + } - //SetControl32BitMaximum( *m_peer, GetCount() ); + //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() ); - return pos; + return pos - 1; #else - return m_choice->DoInsert( item , pos ) ; + return m_choice->DoInsertItems( items, pos, clientData, type ); #endif } @@ -579,7 +564,7 @@ void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData) #if USE_HICOMBOBOX return; //TODO #else - return m_choice->DoSetItemClientData( n , clientData ) ; + return m_choice->DoSetItemClientData( n , clientData ); #endif } @@ -588,66 +573,32 @@ void* wxComboBox::DoGetItemClientData(unsigned int n) const #if USE_HICOMBOBOX return NULL; //TODO #else - return m_choice->DoGetItemClientData( n ) ; + return m_choice->DoGetItemClientData( n ); #endif } -void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) -{ -#if USE_HICOMBOBOX - return; //TODO -#else - return m_choice->DoSetItemClientObject( n , clientData ) ; -#endif -} - -wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const -{ -#if USE_HICOMBOBOX - return NULL; -#else - return m_choice->DoGetItemClientObject( n ) ; -#endif -} - -void wxComboBox::FreeData() -{ - if (HasClientObjectData()) - { - unsigned int count = GetCount(); - for ( unsigned int n = 0; n < count; n++ ) - { - SetClientObject( n, NULL ); - } - } -} - unsigned int wxComboBox::GetCount() const { #if USE_HICOMBOBOX - return (unsigned int) HIComboBoxGetItemCount( *m_peer ); + return (unsigned int) HIComboBoxGetItemCount( m_peer->GetControlRef() ); #else - return m_choice->GetCount() ; + return m_choice->GetCount(); #endif } -void wxComboBox::Delete(unsigned int n) +void wxComboBox::DoDeleteOneItem(unsigned int n) { #if USE_HICOMBOBOX - HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex)n ); + HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex)n ); #else - // force client object deletion - if( HasClientObjectData() ) - SetClientObject( n, NULL ); m_choice->Delete( n ); #endif } -void wxComboBox::Clear() +void wxComboBox::DoClear() { - FreeData(); #if USE_HICOMBOBOX - for ( CFIndex i = GetCount() - 1 ; i >= 0 ; ++ i ) - verify_noerr( HIComboBoxRemoveItemAtIndex( *m_peer, i ) ); + for ( CFIndex i = GetCount() - 1; i >= 0; ++ i ) + verify_noerr( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), i ) ); m_peer->SetData(kHIComboBoxEditTextPart,kControlEditTextCFStringTag,CFSTR("")); #else m_choice->Clear(); @@ -657,7 +608,7 @@ void wxComboBox::Clear() int wxComboBox::GetSelection() const { #if USE_HICOMBOBOX - return FindString( GetStringSelection() ) ; + return FindString( GetStringSelection() ); #else return m_choice->GetSelection(); #endif @@ -666,7 +617,7 @@ int wxComboBox::GetSelection() const void wxComboBox::SetSelection(int n) { #if USE_HICOMBOBOX - SetControl32BitValue( *m_peer , n + 1 ) ; + SetControl32BitValue( m_peer->GetControlRef() , n + 1 ); #else m_choice->SetSelection( n ); @@ -685,7 +636,7 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const if (GetString(i).IsSameAs(s, bCase) ) return i ; } - return wxNOT_FOUND ; + return wxNOT_FOUND; #else return m_choice->FindString( s, bCase ); #endif @@ -695,7 +646,7 @@ wxString wxComboBox::GetString(unsigned int n) const { #if USE_HICOMBOBOX CFStringRef itemText; - HIComboBoxCopyTextItemAtIndex( *m_peer, (CFIndex)n, &itemText ); + HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)n, &itemText ); return wxMacCFStringHolder(itemText).AsString(); #else return m_choice->GetString( n ); @@ -705,7 +656,7 @@ wxString wxComboBox::GetString(unsigned int n) const wxString wxComboBox::GetStringSelection() const { #if USE_HICOMBOBOX - return wxMacCFStringHolder(m_peer->GetData(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString() ; + return wxMacCFStringHolder(m_peer->GetData(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString(); #else int sel = GetSelection (); if (sel != wxNOT_FOUND) @@ -718,11 +669,11 @@ wxString wxComboBox::GetStringSelection() const void wxComboBox::SetString(unsigned int n, const wxString& s) { #if USE_HICOMBOBOX - verify_noerr ( HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex) n, + verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n, wxMacCFStringHolder(s, m_font.GetEncoding()) ) ); - verify_noerr ( HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex) n + 1 ) ); + verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) ); #else - m_choice->SetString( n , s ) ; + m_choice->SetString( n , s ); #endif } @@ -838,5 +789,5 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR event.SetEventObject(this); event.SetString(GetStringSelection()); ProcessCommand(event); - return noErr ; + return noErr; }