check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / mac / carbon / choice.cpp

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 42c52012b2f3e7dd017a4096b6b4d02c274e23a2..e5f7c54da458b413af1a69151b92493b12ec3c37 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -1,151 +1,305 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/mac/carbon/choice.cpp

 // Purpose:     wxChoice
 // Purpose:     wxChoice

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE

 
 

-// For compilers that support precompilation, includes "wx.h".

 #include "wx/choice.h"
 #include "wx/choice.h"

-#include "wx/mac/uma.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/dcclient.h"

 #endif
 
 #endif
 

-bool wxChoice::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-                               int n, const wxString choices[],
-                               long style,
-           const wxValidator& validator,
-           const wxString& name)
+#include "wx/mac/uma.h"
+
+extern MenuHandle NewUniqueMenu() ;
+
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
+
+
+wxChoice::~wxChoice()
+{
+    if ( HasClientObjectData() )
+    {
+        unsigned int 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,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )
+{
+    return Create(
+        parent, id, pos, size, 0, NULL,
+        style, validator, name );
+
+    Append( choices );
+
+    if ( !choices.empty() )
+        SetSelection( 0 );
+}
+
+bool wxChoice::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    int n,
+    const wxString choices[],
+    long style,
+    const wxValidator& validator,
+    const wxString& name )

 {
 {

-    m_noStrings = n;
+    m_macIsUserPane = false;
+
+    if ( !wxChoiceBase::Create( parent, id, pos, size, style, validator, name ) )
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size );
+
+    m_peer = new wxMacControl( this ) ;
+    OSStatus err = CreatePopupButtonControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
+        -12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    m_macPopUpMenuHandle = NewUniqueMenu() ;
+    m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
+    m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 );
+    MacPostControlCreate( pos, size );

 
 

-               Rect bounds ;
-               Str255 title ;
-       
-               MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
-       
-               m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0, 
-               kControlPopupButtonProc , (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++ )
-               {
-                       appendmenu( m_macPopUpMenuHandle , choices[i] ) ;
-               }
-               SetControlMinimum( m_macControl , 0 ) ;
-               SetControlMaximum( m_macControl , m_noStrings) ;
-               SetControlValue( m_macControl , 1 ) ;
+#if !wxUSE_STL
+    if ( style & wxCB_SORT )
+        // autosort
+        m_strings = wxArrayString( 1 );
+#endif
+
+    Append(n, choices);
+
+    // Set the first item as being selected
+    if (n > 0)
+        SetSelection( 0 );

 
 

-               MacPostControlCreate() ;
+    // Needed because it is a wxControlWithItems
+    SetInitialSize( size );

 
 

-       return TRUE;
+    return true;

 }
 
 }
 

-void wxChoice::Append(const wxString& item)
+// ----------------------------------------------------------------------------
+// adding/deleting items to/from the list
+// ----------------------------------------------------------------------------
+
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)

 {
 {

-       appendmenu( m_macPopUpMenuHandle , item ) ;
-    m_noStrings ++;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    const unsigned int numItems = items.GetCount();
+    for( unsigned int i = 0; i < numItems; ++i, ++pos )
+    {
+        unsigned int idx;
+
+#if wxUSE_STL
+        if ( IsSorted() )
+        {
+            wxArrayString::iterator
+                insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), items[i] );
+            idx = insertPoint - m_strings.begin();
+            m_strings.insert( insertPoint, items[i] );
+        }
+        else
+#endif // wxUSE_STL
+        {
+            idx = pos;
+            m_strings.Insert( items[i], idx );
+        }
+
+        UMAInsertMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ),
+                          items[i],
+                          m_font.GetEncoding(),
+                          idx);
+        m_datas.Insert( NULL, idx );
+        AssignNewItemClientData(idx, clientData, i, type);
+    }
+
+    m_peer->SetMaximum( GetCount() );
+
+    return pos - 1;

 }
 
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)

 {
 {

-       wxASSERT( n < m_noStrings ) ;
-    ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
-    m_noStrings --;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") );
+
+    if ( HasClientObjectData() )
+        delete GetClientObject( n );
+
+    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 ) ;
+    m_strings.RemoveAt( n ) ;
+    m_datas.RemoveAt( n ) ;
+    m_peer->SetMaximum( GetCount() ) ;

 }
 
 }
 

-void wxChoice::Clear()
+void wxChoice::DoClear()

 {
 {

-    for ( int i = 0 ; i < m_noStrings ; i++ )
+    for ( unsigned int i = 0 ; i < GetCount() ; i++ )

     {
     {

-       ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-       }
-    m_noStrings = 0;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+    }
+
+    m_strings.Empty() ;
+    m_datas.Empty() ;
+    m_peer->SetMaximum( 0 ) ;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------

 int wxChoice::GetSelection() const
 {
 int wxChoice::GetSelection() const
 {

-    return GetControlValue( m_macControl ) -1 ;
+    return m_peer->GetValue() - 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);
+    m_peer->SetValue( n + 1 ) ;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// string list functions
+// ----------------------------------------------------------------------------

 
 

-void wxChoice::SetSelection(int n)
+unsigned int wxChoice::GetCount() const

 {
 {

-    SetControlValue( m_macControl , n + 1 ) ;
+    return m_strings.GetCount() ;

 }
 
 }
 

-int wxChoice::FindString(const wxString& s) const
+int wxChoice::FindString( const wxString& s, bool bCase ) const

 {
 {

-    for( int i = 0 ; i < m_noStrings ; i++ )
-    {
-       if ( GetString( i ) == s )
-               return i ; 
-    }
-    return -1;
+#if !wxUSE_STL
+    // Avoid assert for non-default args passed to sorted array Index
+    if ( IsSorted() )
+        bCase = true;
+#endif
+
+    return m_strings.Index( s , bCase ) ;

 }
 
 }
 

-wxString wxChoice::GetString(int n) const
+void wxChoice::SetString(unsigned int n, const wxString& s)

 {
 {

-       Str255 text ;
-    ::GetMenuItemText( m_macPopUpMenuHandle , n+1 , text ) ;
-    p2cstr( text ) ;
-    return wxString( text );
+    wxCHECK_RET( IsValid(n), wxT("wxChoice::SetString(): invalid index") );
+
+    m_strings[n] = s ;
+
+    // apple menu pos is 1-based
+    UMASetMenuItemText( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 , s , wxFont::GetDefaultEncoding() ) ;

 }
 
 }
 

-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

-  wxControl::SetSize( x,y,width,height,sizeFlags ) ;
+    wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") );
+
+    return m_strings[n] ;

 }
 
 }
 

-wxString wxChoice::GetStringSelection () const
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
-    else
-        return wxString("");
+    wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") );
+
+    m_datas[n] = (char*)clientData ;

 }
 
 }
 

-bool wxChoice::SetStringSelection (const wxString& s)
+void * wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
-        {
-            SetSelection (sel);
-            return TRUE;
-        }
-    else
-        return FALSE;
+    wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );
+
+    return (void *)m_datas[n];
+}
+
+wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+    wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+
+    // actually n should be made sure by the os to be a valid selection, but ...
+    int n = GetSelection();
+    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 );
+    }
+
+    return noErr ;

 }
 
 }
 

-void wxChoice::Command(wxCommandEvent & event)
+wxSize wxChoice::DoGetBestSize() const

 {
 {

-    SetSelection (event.GetInt());
-    ProcessCommand (event);
+    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
+    int lbHeight = 20;
+    int wLine;
+
+    SInt32 metric ;
+
+    GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
+    lbHeight = metric ;
+
+    {
+        wxClientDC dc(const_cast<wxChoice*>(this));
+
+        // Find the widest line
+        for(unsigned int i = 0; i < GetCount(); i++)
+        {
+            wxString str(GetString(i));
+
+            wxCoord width, height ;
+            dc.GetTextExtent( str , &width, &height);
+            wLine = width ;
+
+            lbWidth = wxMax( lbWidth, wLine ) ;
+        }
+
+        // Add room for the popup arrow
+        lbWidth += 2 * lbHeight ;
+
+        wxCoord width, height ;
+        dc.GetTextExtent( wxT("X"), &width, &height);
+        int cx = width ;
+        lbHeight += 4;
+
+        lbWidth += cx ;
+    }
+
+    return wxSize( lbWidth, lbHeight );

 }
 
 }
 

+#endif // wxUSE_CHOICE