cleanup

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index ec6a728102ba92f6d235c28e5a3ae68eca31bad6..f2173eb03ce648f273d0f1b15a4fab6d8b584a0e 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -1,122 +1,194 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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"

 
 

-#include "wx/defs.h"
+#if wxUSE_CHOICE

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

-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+#endif
+

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

-#if !USE_SHARED_LIBRARY
+extern MenuHandle NewUniqueMenu() ;
+

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

-#endif

 
 

-short nextMenuId = 100 ; // wxMenu takes the lower ids

 
 wxChoice::~wxChoice()
 {
 
 wxChoice::~wxChoice()
 {

-       // DeleteMenu( m_macPopUpMenuId ) ;
-       // DisposeMenu( m_macPopUpMenuHandle ) ;
+    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,
-                  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 )

 {
 {

+    wxCArrayString chs( choices );

 
 

-               Rect bounds ;
-               Str255 title ;
-       
-               MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    return Create(
+        parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+        style, validator, name );
+}
+
+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_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
-               kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
-       
-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
-               SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
-               SetControlMinimum( m_macControl , 0 ) ;
-               SetControlMaximum( m_macControl , 0) ;
-               if ( n > 0 )
-                       SetControlValue( m_macControl , 1 ) ;
+    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 );

 
 

-               MacPostControlCreate() ;
+    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

 
     for ( int i = 0; i < n; i++ )
     {
 
     for ( int i = 0; i < n; i++ )
     {

-        Append(choices[i]);
+        Append( choices[i] );

     }
     }

-       return TRUE;
+
+    // Set the first item as being selected
+    if (n > 0)
+        SetSelection( 0 );
+
+    // Needed because it is a wxControlWithItems
+    SetBestSize( size );
+
+    return true;

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

+int wxChoice::DoAppend( const wxString& item )
+{
+#if wxUSE_STL
+    wxArrayString::iterator insertPoint;
+    unsigned int index;
+
+    if (GetWindowStyle() & wxCB_SORT)
+    {
+        insertPoint = std::lower_bound( m_strings.begin(), m_strings.end(), item );
+        index = insertPoint - m_strings.begin();
+    }
+    else
+    {
+        insertPoint = m_strings.end();
+        index = m_strings.size();
+    }
+
+    m_strings.insert( insertPoint, item );
+#else
+    unsigned int index = m_strings.Add( item );
+#endif
+
+    m_datas.Insert( NULL , index );
+    UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), index );
+    DoSetItemClientData( index, NULL );
+    m_peer->SetMaximum( GetCount() );

 
 

-int wxChoice::DoAppend(const wxString& item)
+    return index;
+}
+
+int wxChoice::DoInsert( const wxString& item, unsigned int pos )

 {
 {

-       Str255 label;
-       wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
-       AppendMenu( m_macPopUpMenuHandle , label ) ;
-       m_strings.Add( item ) ;
-       m_datas.Add( NULL ) ;
-       int index = m_strings.GetCount()  - 1  ;
-       DoSetItemClientData( index , NULL ) ;
-       SetControlMaximum( m_macControl , Number()) ;
-       return index ;
+    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1, wxT("wxChoice::DoInsert: can't insert into sorted list") );
+    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("wxChoice::DoInsert: invalid index") );
+
+    if (pos == GetCount())
+        return DoAppend( item );
+
+    UMAInsertMenuItem( MAC_WXHMENU( m_macPopUpMenuHandle ), item, m_font.GetEncoding(), pos );
+    m_strings.Insert( item, pos );
+    m_datas.Insert( NULL, pos );
+    DoSetItemClientData( pos, NULL );
+    m_peer->SetMaximum( GetCount() );
+
+    return pos;

 }
 
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::Delete(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);
-    }
+        delete GetClientObject( n );

 
 

-    ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
-    m_strings.Remove( n ) ;
-    m_datas.Remove( n ) ;
-       SetControlMaximum( m_macControl , Number()) ;
+    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1 ) ;
+    m_strings.RemoveAt( n ) ;
+    m_datas.RemoveAt( n ) ;
+    m_peer->SetMaximum( GetCount() ) ;

 }
 
 void wxChoice::Clear()
 {
 }
 
 void wxChoice::Clear()
 {

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

     {
     {

-       ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-         }
+        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+    }
+

     m_strings.Empty() ;
     m_datas.Empty() ;
     m_strings.Empty() ;
     m_datas.Empty() ;

-       SetControlMaximum( m_macControl , 0 ) ;
+    m_peer->SetMaximum( 0 ) ;

 }
 
 }
 

-void wxChoice::Free()
+void wxChoice::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++ )

         {
         {

-            delete GetClientObject(n);
+            delete GetClientObject( n );

         }
     }
 }
         }
     }
 }


@@ -124,102 +196,164 @@ void wxChoice::Free()
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------

-

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

-    return GetControlValue( m_macControl ) -1 ;
+    return m_peer->GetValue() - 1 ;

 }
 
 }
 

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

 {
 {

-    SetControlValue( 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 ( HasFlag(wxCB_SORT) )
+        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("not implemented"));
+    wxCHECK_RET( IsValid(n), wxT("wxChoice::SetString(): invalid index") );

 
 

-#if 0 // should do this, but no Insert() so far
-    Delete(n);
-    Insert(n + 1, s);
-#endif
-}
+    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

 {
 {

-       return m_strings[n] ;
+    wxCHECK_MSG( IsValid(n), wxEmptyString, wxT("wxChoice::GetString(): invalid index") );
+
+    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 && n < m_datas.GetCount(),
-                 "invalid index in wxChoice::SetClientData" );
-       wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ;
-       
-       if ( m_datas.GetCount() > n )
-       {
-       m_datas[n] = (char*) clientData ;
-    }
-    else
-    {
-       m_datas.Add( (char*) clientData ) ;
-    }
+    wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") );
+
+    m_datas[n] = (char*)clientData ;

 }
 
 }
 

-void *wxChoice::DoGetItemClientData(int N) const
+void * wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
-                 "invalid index in wxChoice::GetClientData" );
+    wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );

 
 

-    return (void *)m_datas[N];
+    return (void *)m_datas[n];

 }
 
 }
 

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

 {
     DoSetItemClientData(n, clientData);
 }
 
 {
     DoSetItemClientData(n, clientData);
 }
 

-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const

 {
 {

-    return (wxClientData *)DoGetItemClientData(n);
+    return (wxClientData*)DoGetItemClientData( n ) ;

 }
 
 }
 

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

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
-         event.SetInt(GetSelection());
-    event.SetEventObject(this);
-    event.SetString(GetStringSelection());
-    ProcessCommand(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;
+
+#if TARGET_CARBON
+    long metric ;
+
+    GetThemeMetric( kThemeMetricPopupButtonHeight , &metric );
+    lbHeight = metric ;
+#endif
+
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+        if ( m_font.Ok() )
+        {
+            ::TextFont( m_font.MacGetFontNum() ) ;
+            ::TextSize( m_font.MacGetFontSize() ) ;
+            ::TextFace( m_font.MacGetFontStyle() ) ;
+        }
+        else
+        {
+            ::TextFont( kFontIDMonaco ) ;
+            ::TextSize( 9 ) ;
+            ::TextFace( 0 ) ;
+        }
+
+        // Find the widest line
+        for(unsigned int i = 0; i < GetCount(); i++)
+        {
+            wxString str(GetString(i));
+
+#if wxUSE_UNICODE
+            Point bounds = { 0, 0 } ;
+            SInt16 baseline ;
+
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+
+            wLine = bounds.h ;
+#else
+            wLine = ::TextWidth( str.c_str() , 0 , str.length() ) ;
+#endif
+
+            lbWidth = wxMax( lbWidth, wLine ) ;
+        }
+
+        // Add room for the popup arrow
+        lbWidth += 2 * lbHeight ;
+
+        // And just a bit more
+        int cx = ::TextWidth( "X" , 0 , 1 ) ;
+        lbWidth += cx ;
+    }
+
+    return wxSize( lbWidth, lbHeight );

 }
 }

-*/
+
+#endif // wxUSE_CHOICE