X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..85d3d198c2fa866d39763ace3eebf14c0d164ba7:/src/mac/carbon/combobxc.cpp?ds=inline diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp index b26e9741da..9a63c93e70 100644 --- a/src/mac/carbon/combobxc.cpp +++ b/src/mac/carbon/combobxc.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: 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 @@ -9,25 +9,23 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "combobox.h" -#endif +#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__ - #include + #include #endif #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) -#endif - -// composite combobox implementation by Dan "Bud" Keith bud@otsys.com #if TARGET_API_MAC_OSX #define USE_HICOMBOBOX 1 //use hi combobox define @@ -35,26 +33,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) #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() ) { @@ -69,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 ) @@ -149,21 +147,17 @@ 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; + } } return; @@ -205,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: @@ -217,7 +211,7 @@ private: }; BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice) - EVT_CHOICE(-1, wxComboBoxChoice::OnChoice) + EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice) END_EVENT_TABLE() wxComboBox::~wxComboBox() @@ -246,7 +240,7 @@ wxComboBox::~wxComboBox() wxSize wxComboBox::DoGetBestSize() const { #if USE_HICOMBOBOX - return wxControl::DoGetBestSize(); + return wxControl::DoGetBestSize(); #else wxSize size = m_choice->GetBestSize(); @@ -263,7 +257,7 @@ wxSize wxComboBox::DoGetBestSize() const void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { #if USE_HICOMBOBOX - wxControl::DoMoveWindow(x, y, width, height); + wxControl::DoMoveWindow(x, y, width, height); #else height = POPUPHEIGHT; @@ -273,13 +267,13 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { { // we might not be fully constructed yet, therefore watch out... if ( m_choice ) - m_choice->SetSize(0, 0 , width, -1); + m_choice->SetSize(0, 0 , width, wxDefaultCoord); } else { wxCoord wText = width - POPUPWIDTH - MARGIN; m_text->SetSize(0, 0, wText, height); - m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1); + m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, wxDefaultCoord); } #endif } @@ -293,23 +287,23 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) { bool wxComboBox::Enable(bool enable) { if ( !wxControl::Enable(enable) ) - return FALSE; + return false; - return TRUE; + return true; } bool wxComboBox::Show(bool show) { if ( !wxControl::Show(show) ) - return FALSE; + return false; - return TRUE; + return true; } void wxComboBox::SetFocus() { #if USE_HICOMBOBOX - wxControl::SetFocus(); + wxControl::SetFocus(); #else if ( m_text != NULL) { m_text->SetFocus(); @@ -358,15 +352,15 @@ 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) ) { - return FALSE; + 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; @@ -380,34 +374,32 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, //hiRect.size.width = bounds.right - bounds.left; //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() ; - verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, *m_peer ) ); + //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->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++ ) + for ( int i = 0; i < n; i++ ) { DoAppend( 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 ) @@ -417,28 +409,28 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, else { m_text = new wxComboBoxText(this); - if ( size.y == -1 ) { - csize.y = m_text->GetSize().y ; + if ( size.y == wxDefaultCoord ) { + csize.y = m_text->GetSize().y; } } DoSetSize(pos.x, pos.y, csize.x, csize.y); - for ( int i = 0 ; i < n ; i++ ) + for ( int i = 0; i < n; i++ ) { m_choice->DoAppend( choices[ i ] ); } - SetBestSize(csize); // Needed because it is a wxControlWithItems + SetInitialSize(csize); // Needed because it is a wxControlWithItems #endif - return TRUE; + return true; } 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; @@ -464,9 +456,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 } @@ -532,7 +524,7 @@ long wxComboBox::GetInsertionPoint() const return 0; } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { // TODO return 0; @@ -557,87 +549,87 @@ int wxComboBox::DoAppend(const wxString& item) { #if USE_HICOMBOBOX CFIndex outIndex; - HIComboBoxAppendTextItem( *m_peer, wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex ); - //SetControl32BitMaximum( *m_peer, GetCount() ); + HIComboBoxAppendTextItem( m_peer->GetControlRef(), wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex ); + //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() ); return (int) outIndex; #else - return m_choice->DoAppend( item ) ; + return m_choice->DoAppend( item ); #endif } -int wxComboBox::DoInsert(const wxString& item, int pos) +int wxComboBox::DoInsert(const wxString& item, unsigned int pos) { #if USE_HICOMBOBOX - HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) ); + HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) ); - //SetControl32BitMaximum( *m_peer, GetCount() ); + //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() ); return pos; #else - return m_choice->DoInsert( item , pos ) ; + return m_choice->DoInsert( item , pos ); #endif } -void wxComboBox::DoSetItemClientData(int n, void* clientData) +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 } -void* wxComboBox::DoGetItemClientData(int n) const +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(int n, wxClientData* clientData) +void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData) { #if USE_HICOMBOBOX return; //TODO #else - return m_choice->DoSetItemClientObject( n , clientData ) ; + return m_choice->DoSetItemClientObject( n , clientData ); #endif } -wxClientData* wxComboBox::DoGetItemClientObject(int n) const +wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const { #if USE_HICOMBOBOX return NULL; #else - return m_choice->DoGetItemClientObject( n ) ; + return m_choice->DoGetItemClientObject( n ); #endif } void wxComboBox::FreeData() { - if ( HasClientObjectData() ) + if (HasClientObjectData()) { - size_t count = GetCount(); - for ( size_t n = 0; n < count; n++ ) + unsigned int count = GetCount(); + for ( unsigned int n = 0; n < count; n++ ) { SetClientObject( n, NULL ); } } } -int wxComboBox::GetCount() const { +unsigned int wxComboBox::GetCount() const { #if USE_HICOMBOBOX - return (int) HIComboBoxGetItemCount( *m_peer ); + return (unsigned int) HIComboBoxGetItemCount( m_peer->GetControlRef() ); #else - return m_choice->GetCount() ; + return m_choice->GetCount(); #endif } -void wxComboBox::Delete(int n) +void wxComboBox::Delete(unsigned int n) { #if USE_HICOMBOBOX - HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex)n ); + HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex)n ); #else // force client object deletion if( HasClientObjectData() ) @@ -650,8 +642,8 @@ void wxComboBox::Clear() { 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(); @@ -661,7 +653,7 @@ void wxComboBox::Clear() int wxComboBox::GetSelection() const { #if USE_HICOMBOBOX - return FindString( GetStringSelection() ) ; + return FindString( GetStringSelection() ); #else return m_choice->GetSelection(); #endif @@ -670,36 +662,36 @@ 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 ); if ( m_text != NULL ) { - m_text->SetValue( GetString( n ) ); + m_text->SetValue(GetString(n)); } #endif } -int wxComboBox::FindString(const wxString& s) const +int wxComboBox::FindString(const wxString& s, bool bCase) const { #if USE_HICOMBOBOX - for( int i = 0 ; i < GetCount() ; i++ ) + for( unsigned int i = 0 ; i < GetCount() ; i++ ) { - if ( GetString( i ).IsSameAs(s, FALSE) ) + if (GetString(i).IsSameAs(s, bCase) ) return i ; } - return wxNOT_FOUND ; + return wxNOT_FOUND; #else - return m_choice->FindString( s ); + return m_choice->FindString( s, bCase ); #endif } -wxString wxComboBox::GetString(int n) const +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 ); @@ -709,53 +701,41 @@ wxString wxComboBox::GetString(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 > -1) - return wxString(this->GetString (sel)); + if (sel != wxNOT_FOUND) + return wxString(this->GetString((unsigned int)sel)); else return wxEmptyString; #endif } -bool wxComboBox::SetStringSelection(const wxString& sel) -{ - int s = FindString (sel); - if (s > -1) - { - SetSelection (s); - return TRUE; - } - else - return FALSE; -} - -void wxComboBox::SetString(int n, const wxString& s) +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 } bool wxComboBox::IsEditable() const { #if USE_HICOMBOBOX - // TODO - return !HasFlag(wxCB_READONLY); + // TODO + return !HasFlag(wxCB_READONLY); #else - return m_text != NULL && !HasFlag(wxCB_READONLY); + return m_text != NULL && !HasFlag(wxCB_READONLY); #endif } void wxComboBox::Undo() { #if USE_HICOMBOBOX - // TODO + // TODO #else if (m_text != NULL) m_text->Undo(); @@ -765,7 +745,7 @@ void wxComboBox::Undo() void wxComboBox::Redo() { #if USE_HICOMBOBOX - // TODO + // TODO #else if (m_text != NULL) m_text->Redo(); @@ -775,7 +755,7 @@ void wxComboBox::Redo() void wxComboBox::SelectAll() { #if USE_HICOMBOBOX - // TODO + // TODO #else if (m_text != NULL) m_text->SelectAll(); @@ -785,8 +765,8 @@ void wxComboBox::SelectAll() bool wxComboBox::CanCopy() const { #if USE_HICOMBOBOX - // TODO - return false; + // TODO + return false; #else if (m_text != NULL) return m_text->CanCopy(); @@ -798,8 +778,8 @@ bool wxComboBox::CanCopy() const bool wxComboBox::CanCut() const { #if USE_HICOMBOBOX - // TODO - return false; + // TODO + return false; #else if (m_text != NULL) return m_text->CanCut(); @@ -811,8 +791,8 @@ bool wxComboBox::CanCut() const bool wxComboBox::CanPaste() const { #if USE_HICOMBOBOX - // TODO - return false; + // TODO + return false; #else if (m_text != NULL) return m_text->CanPaste(); @@ -824,8 +804,8 @@ bool wxComboBox::CanPaste() const bool wxComboBox::CanUndo() const { #if USE_HICOMBOBOX - // TODO - return false; + // TODO + return false; #else if (m_text != NULL) return m_text->CanUndo(); @@ -837,8 +817,8 @@ bool wxComboBox::CanUndo() const bool wxComboBox::CanRedo() const { #if USE_HICOMBOBOX - // TODO - return false; + // TODO + return false; #else if (m_text != NULL) return m_text->CanRedo(); @@ -854,6 +834,5 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR event.SetEventObject(this); event.SetString(GetStringSelection()); ProcessCommand(event); - return noErr ; + return noErr; } -