// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id: combobox_osx.cpp 58318 2009-01-23 08:36:16Z RR $
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
-#if wxUSE_COMBOBOX
+#if wxUSE_COMBOBOX && wxOSX_USE_COCOA
#include "wx/combobox.h"
+#include "wx/osx/private.h"
#ifndef WX_PRECOMP
#endif
// work in progress
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-
wxComboBox::~wxComboBox()
{
}
const wxValidator& validator,
const wxString& name)
{
+ DontCreatePeer();
+
m_text = NULL;
m_choice = NULL;
-
- m_macIsUserPane = false;
-
+
if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
return false;
-
- m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
- MacPostControlCreate( pos, size );
+ wxASSERT_MSG( !(style & wxCB_SORT),
+ "wxCB_SORT not currently supported by wxOSX/Cocoa");
-#if !wxUSE_STL
- if ( style & wxCB_SORT )
- // autosort
- m_strings = wxArrayString( 1 );
-#endif
+ SetPeer(wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() ));
+
+ MacPostControlCreate( pos, size );
Append(n, choices);
- // Set the first item as being selected
- if (n > 0)
+ // Set up the initial value, by default the first item is selected.
+ if ( !value.empty() )
+ SetValue(value);
+ else if (n > 0)
SetSelection( 0 );
// Needed because it is a wxControlWithItems
return true;
}
-// ----------------------------------------------------------------------------
-// geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxComboBox::DoGetBestSize() const
-{
-#if USE_HICOMBOBOX
- return wxControl::DoGetBestSize();
-#else
- wxSize size = m_choice->GetBestSize();
-
- if ( m_text != NULL )
- {
- wxSize sizeText = m_text->GetBestSize();
-
- size.x = POPUPWIDTH + sizeText.x + MARGIN;
- }
-
- return size;
-#endif
-}
-
-void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
-#if USE_HICOMBOBOX
- wxControl::DoMoveWindow(x, y, width, height);
-#else
- height = POPUPHEIGHT;
-
- wxControl::DoMoveWindow(x, y, width, height);
-
- if ( m_text == NULL )
- {
- // we might not be fully constructed yet, therefore watch out...
- if ( m_choice )
- 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, wxDefaultCoord);
- }
-#endif
-}
-
-
-
-// ----------------------------------------------------------------------------
-// operations forwarded to the subcontrols
-// ----------------------------------------------------------------------------
-
-bool wxComboBox::Enable(bool enable)
-{
- if ( !wxControl::Enable(enable) )
- return false;
-
- return true;
-}
-
-bool wxComboBox::Show(bool show)
-{
- if ( !wxControl::Show(show) )
- return false;
-
- return true;
-}
-
-void wxComboBox::SetFocus()
-{
-#if USE_HICOMBOBOX
- wxControl::SetFocus();
-#else
- if ( m_text != NULL) {
- m_text->SetFocus();
- }
-#endif
-}
-
-
void wxComboBox::DelegateTextChanged( const wxString& value )
{
SetStringSelection( value );
}
-
void wxComboBox::DelegateChoice( const wxString& value )
{
SetStringSelection( value );
}
-bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
- const wxString& value,
- const wxPoint& pos,
- const wxSize& size,
- int n, const wxString choices[],
- long style,
- const wxValidator& validator,
- const wxString& name)
-{
- m_text = NULL;
- m_choice = NULL;
-#if USE_HICOMBOBOX
- m_macIsUserPane = false;
-#endif
- if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
- wxDefaultValidator, name) )
- {
- return false;
- }
-#if USE_HICOMBOBOX
- Rect bounds = wxMacGetBoundsForControl( this , pos , size );
- HIRect hiRect;
-
- hiRect.origin.x = 20; //bounds.left;
- hiRect.origin.y = 25; //bounds.top;
- hiRect.size.width = 120;// bounds.right - bounds.left;
- hiRect.size.height = 24;
-
- //For some reason, this code causes the combo box not to be displayed at all.
- //hiRect.origin.x = bounds.left;
- //hiRect.origin.y = bounds.top;
- //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(this);
- verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, m_peer->GetControlRefAddr() ) );
-
-
- m_peer->SetMinimum( 0 );
- m_peer->SetMaximum( 100);
- if ( n > 0 )
- m_peer->SetValue( 1 );
-
- MacPostControlCreate(pos,size);
-
- Append( choices[ i ] );
-
- HIViewSetVisible( m_peer->GetControlRef(), true );
- SetSelection(0);
- EventHandlerRef comboEventHandler;
- InstallControlEventHandler( m_peer->GetControlRef(), GetwxMacComboBoxEventHandlerUPP(),
- GetEventTypeCount(eventList), eventList, this,
- (EventHandlerRef *)&comboEventHandler);
-#else
- m_choice = new wxComboBoxChoice(this, style );
- m_choice->SetMinSize( wxSize( POPUPWIDTH , POPUPHEIGHT ) );
-
- wxSize csize = size;
- if ( style & wxCB_READONLY )
- {
- m_text = NULL;
- }
- else
- {
- m_text = new wxComboBoxText(this);
- if ( size.y == wxDefaultCoord ) {
- csize.y = m_text->GetSize().y;
- }
- }
-
- DoSetSize(pos.x, pos.y, csize.x, csize.y);
-
- m_choice->Append( n, choices );
- SetInitialSize(csize); // Needed because it is a wxControlWithItems
-#endif
-
- return true;
-}
-
-wxString wxComboBox::GetValue() const
-{
-#if USE_HICOMBOBOX
- CFStringRef myString;
- HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString );
- return wxMacCFStringHolder( myString, GetFont().GetEncoding() ).AsString();
-#else
- wxString result;
-
- if ( m_text == NULL )
- {
- result = m_choice->GetString( m_choice->GetSelection() );
- }
- else
- {
- result = m_text->GetValue();
- }
-
- return result;
-#endif
-}
-
-void wxComboBox::SetValue(const wxString& value)
-{
-#if USE_HICOMBOBOX
-
-#else
- int s = FindString (value);
- if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
- {
- m_choice->Append(value);
- }
- SetStringSelection( value );
-#endif
-}
-
-// Clipboard operations
-void wxComboBox::Copy()
-{
- if ( m_text != NULL )
- {
- m_text->Copy();
- }
-}
-
-void wxComboBox::Cut()
-{
- if ( m_text != NULL )
- {
- m_text->Cut();
- }
-}
-
-void wxComboBox::Paste()
-{
- if ( m_text != NULL )
- {
- m_text->Paste();
- }
-}
-
-void wxComboBox::SetEditable(bool editable)
-{
- if ( ( m_text == NULL ) && editable )
- {
- m_text = new wxComboBoxText( this );
- }
- else if ( ( m_text != NULL ) && !editable )
- {
- delete m_text;
- m_text = NULL;
- }
-
- int currentX, currentY;
- GetPosition( ¤tX, ¤tY );
-
- int currentW, currentH;
- GetSize( ¤tW, ¤tH );
-
- DoMoveWindow( currentX, currentY, currentW, currentH );
-}
-
-void wxComboBox::SetInsertionPoint(long pos)
-{
- // TODO
-}
-
-void wxComboBox::SetInsertionPointEnd()
-{
- // TODO
-}
-
-long wxComboBox::GetInsertionPoint() const
-{
- // TODO
- return 0;
-}
-
-wxTextPos wxComboBox::GetLastPosition() const
-{
- // TODO
- return 0;
-}
-
-void wxComboBox::Replace(long from, long to, const wxString& value)
-{
- // TODO
-}
-
-void wxComboBox::Remove(long from, long to)
-{
- // TODO
-}
-
-void wxComboBox::SetSelection(long from, long to)
-{
- // TODO
-}
-
int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData, wxClientDataType type)
{
-#if USE_HICOMBOBOX
- const unsigned int count = items.GetCount();
- for ( unsigned int i = 0; i < count; ++i, ++pos )
+ const unsigned int numItems = items.GetCount();
+ for( unsigned int i = 0; i < numItems; ++i, ++pos )
{
- HIComboBoxInsertTextItemAtIndex(m_peer->GetControlRef(),
- (CFIndex)pos,
- wxMacCFStringHolder(items[i],
- GetFont().GetEncoding()));
- AssignNewItemClientData(pos, clientData, i, type);
+ unsigned int idx;
+
+ idx = pos;
+ GetComboPeer()->InsertItem( idx, items[i] );
+
+ if (idx > m_datas.GetCount())
+ m_datas.SetCount(idx);
+ m_datas.Insert( NULL, idx );
+ AssignNewItemClientData(idx, clientData, i, type);
}
- //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() );
+ GetPeer()->SetMaximum( GetCount() );
return pos - 1;
-#else
- return m_choice->DoInsertItems( items, pos, clientData, type );
-#endif
}
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
{
-#if USE_HICOMBOBOX
- return; //TODO
-#else
- return m_choice->DoSetItemClientData( n , clientData );
-#endif
+ m_datas[n] = (char*)clientData ;
}
-void* wxComboBox::DoGetItemClientData(unsigned int n) const
+void * wxComboBox::DoGetItemClientData(unsigned int n) const
{
-#if USE_HICOMBOBOX
- return NULL; //TODO
-#else
- return m_choice->DoGetItemClientData( n );
-#endif
+ return (void *)m_datas[n];
}
-unsigned int wxComboBox::GetCount() const {
-#if USE_HICOMBOBOX
- return (unsigned int) HIComboBoxGetItemCount( m_peer->GetControlRef() );
-#else
- return m_choice->GetCount();
-#endif
+unsigned int wxComboBox::GetCount() const
+{
+ return GetComboPeer()->GetNumberOfItems();
}
void wxComboBox::DoDeleteOneItem(unsigned int n)
{
-#if USE_HICOMBOBOX
- HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex)n );
-#else
- m_choice->Delete( n );
-#endif
+ m_datas.RemoveAt(n);
+ GetComboPeer()->RemoveItem(n);
}
void wxComboBox::DoClear()
{
-#if USE_HICOMBOBOX
- for ( CFIndex i = GetCount() - 1; i >= 0; ++ i )
- verify_noerr( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), i ) );
- m_peer->SetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag,CFSTR(""));
-#else
- m_choice->Clear();
-#endif
+ m_datas.Clear();
+ GetComboPeer()->Clear();
+}
+
+void wxComboBox::GetSelection(long *from, long *to) const
+{
+ wxTextEntry::GetSelection(from, to);
}
int wxComboBox::GetSelection() const
{
-#if USE_HICOMBOBOX
- return FindString( GetStringSelection() );
-#else
- return m_choice->GetSelection();
-#endif
+ return GetComboPeer()->GetSelectedItem();
}
void wxComboBox::SetSelection(int n)
{
-#if USE_HICOMBOBOX
- SetControl32BitValue( m_peer->GetControlRef() , n + 1 );
-#else
- m_choice->SetSelection( n );
+ GetComboPeer()->SetSelectedItem(n);
+}
- if ( m_text != NULL )
- {
- m_text->SetValue(GetString(n));
- }
-#endif
+void wxComboBox::SetSelection(long from, long to)
+{
+ wxTextEntry::SetSelection(from, to);
}
int wxComboBox::FindString(const wxString& s, bool bCase) const
{
-#if USE_HICOMBOBOX
- for( unsigned int i = 0 ; i < GetCount() ; i++ )
+ if (!bCase)
{
- if (GetString(i).IsSameAs(s, bCase) )
- return i ;
+ for (unsigned i = 0; i < GetCount(); i++)
+ {
+ if (s.IsSameAs(GetString(i), false))
+ return i;
+ }
+ return wxNOT_FOUND;
}
- return wxNOT_FOUND;
-#else
- return m_choice->FindString( s, bCase );
-#endif
+
+ return GetComboPeer()->FindString(s);
}
wxString wxComboBox::GetString(unsigned int n) const
{
-#if USE_HICOMBOBOX
- CFStringRef itemText;
- HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)n, &itemText );
- return wxMacCFStringHolder(itemText).AsString();
-#else
- return m_choice->GetString( n );
-#endif
+ wxCHECK_MSG( n < GetCount(), wxString(), "Invalid combobox index" );
+
+ return GetComboPeer()->GetStringAtIndex(n);
}
wxString wxComboBox::GetStringSelection() const
{
-#if USE_HICOMBOBOX
- return wxMacCFStringHolder(m_peer->GetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString();
-#else
- int sel = GetSelection ();
- if (sel != wxNOT_FOUND)
- return wxString(this->GetString((unsigned int)sel));
- else
- return wxEmptyString;
-#endif
+ const int sel = GetSelection();
+ return sel == wxNOT_FOUND ? wxString() : GetString(sel);
}
void wxComboBox::SetString(unsigned int n, const wxString& s)
{
-#if USE_HICOMBOBOX
- verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n,
- wxMacCFStringHolder(s, GetFont().GetEncoding()) ) );
- verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) );
-#else
- m_choice->SetString( n , s );
-#endif
+ // Notice that we shouldn't delete and insert the item in this control
+ // itself as this would also affect the client data which we need to
+ // preserve here.
+ GetComboPeer()->RemoveItem(n);
+ GetComboPeer()->InsertItem(n, s);
+ SetValue(s); // changing the item in the list won't update the display item
}
-bool wxComboBox::IsEditable() const
+void wxComboBox::EnableTextChangedEvents(bool WXUNUSED(enable))
{
-#if USE_HICOMBOBOX
- // TODO
- return !HasFlag(wxCB_READONLY);
-#else
- return m_text != NULL && !HasFlag(wxCB_READONLY);
-#endif
+ // nothing to do here, events are never generated when we change the
+ // control value programmatically anyhow by Cocoa
}
-void wxComboBox::Undo()
+bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
{
-#if USE_HICOMBOBOX
- // TODO
-#else
- if (m_text != NULL)
- m_text->Undo();
-#endif
-}
-
-void wxComboBox::Redo()
-{
-#if USE_HICOMBOBOX
- // TODO
-#else
- if (m_text != NULL)
- m_text->Redo();
-#endif
-}
-
-void wxComboBox::SelectAll()
-{
-#if USE_HICOMBOBOX
- // TODO
-#else
- if (m_text != NULL)
- m_text->SelectAll();
-#endif
-}
-
-bool wxComboBox::CanCopy() const
-{
-#if USE_HICOMBOBOX
- // TODO
- return false;
-#else
- if (m_text != NULL)
- return m_text->CanCopy();
- else
- return false;
-#endif
-}
-
-bool wxComboBox::CanCut() const
-{
-#if USE_HICOMBOBOX
- // TODO
- return false;
-#else
- if (m_text != NULL)
- return m_text->CanCut();
- else
- return false;
-#endif
-}
-
-bool wxComboBox::CanPaste() const
-{
-#if USE_HICOMBOBOX
- // TODO
- return false;
-#else
- if (m_text != NULL)
- return m_text->CanPaste();
- else
- return false;
-#endif
+ wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
+ event.SetInt(GetSelection());
+ event.SetEventObject(this);
+ event.SetString(GetStringSelection());
+ ProcessCommand(event);
+ return true;
}
-bool wxComboBox::CanUndo() const
+wxComboWidgetImpl* wxComboBox::GetComboPeer() const
{
-#if USE_HICOMBOBOX
- // TODO
- return false;
-#else
- if (m_text != NULL)
- return m_text->CanUndo();
- else
- return false;
-#endif
+ return dynamic_cast<wxComboWidgetImpl*> (GetPeer());
}
-bool wxComboBox::CanRedo() const
+void wxComboBox::Popup()
{
-#if USE_HICOMBOBOX
- // TODO
- return false;
-#else
- if (m_text != NULL)
- return m_text->CanRedo();
- else
- return false;
-#endif
+ GetComboPeer()->Popup();
}
-bool wxComboBox::OSXHandleClicked( double timestampsec )
+void wxComboBox::Dismiss()
{
- wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
- event.SetInt(GetSelection());
- event.SetEventObject(this);
- event.SetString(GetStringSelection());
- ProcessCommand(event);
- return true;
+ GetComboPeer()->Dismiss();
}
-#endif
+#endif // wxUSE_COMBOBOX && wxOSX_USE_COCOA
projects / wxWidgets.git / blobdiff