cleanup

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index bc77b99ad8b4f35728c5d9b258bcf82a918e45ee..a3e049f59369b6af17b7023e880f721b3ab6739e 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -1,137 +1,175 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxChoice
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     wxChoice
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

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

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

 
 

-#include "wx/defs.h"

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

-#include "wx/menu.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
 

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

 extern MenuHandle NewUniqueMenu() ;
 
 extern MenuHandle NewUniqueMenu() ;
 

+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
+
+

 wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )
     {
 wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )
     {

-        size_t i, max = GetCount();
+        unsigned int i, max = GetCount();

 
         for ( i = 0; i < max; ++i )
 
         for ( i = 0; i < max; ++i )

-            delete GetClientObject(i);
+            delete GetClientObject( i );

     }
 
     }
 

-        // DeleteMenu( m_macPopUpMenuId ) ;
+    // DeleteMenu( m_macPopUpMenuId ) ;

     // DisposeMenu( m_macPopUpMenuHandle ) ;
 }
 
     // DisposeMenu( m_macPopUpMenuHandle ) ;
 }
 

-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)
+bool wxChoice::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    const wxArrayString& choices,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )

 {
 {

-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  wxEmptyString , 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;
+    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_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 );
+
+#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 );
+
+    // Needed because it is a wxControlWithItems
+    SetInitialSize( size );
+
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------

-int wxChoice::DoAppend(const wxString& item)
-{
-    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 ;
-}

 
 

-int wxChoice::DoInsert(const wxString& item, int pos)
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)

 {
 {

-    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
-
-    if (pos == GetCount())
-        return DoAppend(item);
-
-    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
-    m_strings.Insert( item, pos ) ;
-    m_datas.Insert( NULL, pos ) ;
-    DoSetItemClientData( pos , NULL ) ;
-    SetControl32BitMaximum( (ControlHandle) m_macControl , pos) ;
-    return pos ;
+    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)

 {
 {

-    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n) , wxT("wxChoice::Delete: invalid index") );
+

     if ( HasClientObjectData() )
     if ( HasClientObjectData() )

-    {
-        delete GetClientObject(n);
-    }
-    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
-    m_strings.Remove( n ) ;
+        delete GetClientObject( n );
+
+    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 ) ;
+    m_strings.RemoveAt( n ) ;

     m_datas.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;

-    SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+    m_peer->SetMaximum( GetCount() ) ;

 }
 
 }
 

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

 {
 {

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

     {
         ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
     }
     {
         ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
     }

+

     m_strings.Empty() ;
     m_datas.Empty() ;
     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);
-        }
-    }
+    m_peer->SetMaximum( 0 ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -139,90 +177,89 @@ void wxChoice::FreeData()
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {

-    return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
+    return m_peer->GetValue() - 1 ;

 }
 
 }
 

-void wxChoice::SetSelection(int n)
+void wxChoice::SetSelection( int n )

 {
 {

-    SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
+    m_peer->SetValue( n + 1 ) ;

 }
 
 // ----------------------------------------------------------------------------
 // string list functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // string list functions
 // ----------------------------------------------------------------------------
 

-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
     return m_strings.GetCount() ;
 }
 
 {
     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 < GetCount() ; i++ )
-    {
-        if ( GetString( i ).IsSameAs(s, FALSE) )
-            return i ; 
-    }
-    return wxNOT_FOUND ;
+#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 ) ;

 }
 
 }
 

-void wxChoice::SetString(int n, const wxString& s)
+void wxChoice::SetString(unsigned 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
+    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() ) ;

 }
 
 }
 

-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

+    wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") );
+

     return m_strings[n] ;
 }
     return m_strings[n] ;
 }

+

 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------

-void wxChoice::DoSetItemClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
-                 wxT("invalid index in wxChoice::SetClientData") );
-    
-    m_datas[n] = (char*) clientData ;
-}
+    wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") );

 
 

-void *wxChoice::DoGetItemClientData(int n) const
-{
-    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
-                 wxT("invalid index in wxChoice::GetClientData") );
-    return (void *)m_datas[n];
+    m_datas[n] = (char*)clientData ;

 }
 
 }
 

-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+void * wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-    DoSetItemClientData(n, clientData);
-}
+    wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );

 
 

-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
-{
-    return (wxClientData *)DoGetItemClientData(n);
+    return (void *)m_datas[n];

 }
 
 }
 

-void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+wxInt32 wxChoice::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
-    int n = GetSelection();
+    wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+

     // actually n should be made sure by the os to be a valid selection, but ...
     // actually n should be made sure by the os to be a valid selection, but ...

+    int n = GetSelection();

     if ( n > -1 )
     {
         event.SetInt( n );
     if ( n > -1 )
     {
         event.SetInt( n );

-        event.SetString(GetStringSelection());
-        event.SetEventObject(this);
+        event.SetString( GetStringSelection() );
+        event.SetEventObject( this );
+

         if ( HasClientObjectData() )
         if ( HasClientObjectData() )

-            event.SetClientObject( GetClientObject(n) );
+            event.SetClientObject( GetClientObject( n ) );

         else if ( HasClientUntypedData() )
         else if ( HasClientUntypedData() )

-            event.SetClientData( GetClientData(n) );
-        ProcessCommand(event);
+            event.SetClientData( GetClientData( n ) );
+
+        ProcessCommand( event );

     }
     }

+
+    return noErr ;

 }
 
 wxSize wxChoice::DoGetBestSize() const
 }
 
 wxSize wxChoice::DoGetBestSize() const


@@ -230,53 +267,75 @@ wxSize wxChoice::DoGetBestSize() const
     int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
     int lbHeight = 20;
     int wLine;
     int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults
     int lbHeight = 20;
     int wLine;

+

 #if TARGET_CARBON
 #if TARGET_CARBON

-    long metric ;
-    GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );   
-    lbHeight = metric ; 
+    SInt32 metric ;
+
+    GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
+    lbHeight = metric ;

 #endif
 #endif

+

     {
     {

-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
-         Rect drawRect ;
-        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-        if ( font )
+#if wxMAC_USE_CORE_GRAPHICS
+        wxClientDC dc(const_cast<wxChoice*>(this));
+#else
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+        if ( m_font.Ok() )

         {
         {

-            ::TextFont( font->m_macFontNum ) ;
-            ::TextSize( short(font->m_macFontSize) ) ;
-            ::TextFace( font->m_macFontStyle ) ;
+            ::TextFont( m_font.MacGetFontNum() ) ;
+            ::TextSize( m_font.MacGetFontSize() ) ;
+            ::TextFace( m_font.MacGetFontStyle() ) ;

         }
         else
         {
             ::TextFont( kFontIDMonaco ) ;
         }
         else
         {
             ::TextFont( kFontIDMonaco ) ;

-            ::TextSize( 9  );
+            ::TextSize( 9 ) ;

             ::TextFace( 0 ) ;
         }
             ::TextFace( 0 ) ;
         }

+#endif

         // Find the widest line
         // Find the widest line

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

             wxString str(GetString(i));
             wxString str(GetString(i));

-        #if wxUSE_UNICODE
-            Point bounds={0,0} ;
+#if wxMAC_USE_CORE_GRAPHICS
+            wxCoord width, height ;
+            dc.GetTextExtent( str , &width, &height);
+            wLine = width ;
+#else
+#if wxUSE_UNICODE
+            Point bounds = { 0, 0 } ;

             SInt16 baseline ;
             SInt16 baseline ;

-            ::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
+
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,

                 kThemeCurrentPortFont,
                 kThemeStateActive,
                 false,
                 &bounds,
                 &baseline );
                 kThemeCurrentPortFont,
                 kThemeStateActive,
                 false,
                 &bounds,
                 &baseline );

+

             wLine = bounds.h ;
             wLine = bounds.h ;

-        #else
-            wxCharBuffer text = wxMacStringToCString( str ) ;
-            wLine = ::TextWidth( text , 0 , strlen(text) ) ;
-        #endif
-            lbWidth = wxMax(lbWidth, wLine);
+#else
+            wLine = ::TextWidth( str.c_str() , 0 , str.length() ) ;
+#endif
+#endif
+            lbWidth = wxMax( lbWidth, wLine ) ;

         }
         }

+

         // Add room for the popup arrow
         lbWidth += 2 * lbHeight ;
         // Add room for the popup arrow
         lbWidth += 2 * lbHeight ;

+#if wxMAC_USE_CORE_GRAPHICS
+        wxCoord width, height ;
+        dc.GetTextExtent( wxT("X"), &width, &height);
+        int cx = width ;
+        lbHeight += 4;
+#else

         // And just a bit more
         // And just a bit more

-        int cy = 12 ;

         int cx = ::TextWidth( "X" , 0 , 1 ) ;
         int cx = ::TextWidth( "X" , 0 , 1 ) ;

+#endif

         lbWidth += cx ;
         lbWidth += cx ;

-        

     }
     }

-    return wxSize(lbWidth, lbHeight);
+
+    return wxSize( lbWidth, lbHeight );

 }
 }

+
+#endif // wxUSE_CHOICE