compilation warning fix

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index bac3579f34d1a7d6822065b6f561612cac20b802..9a9cf69647277492da327e2a4f70296eeba87ca7 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -8,36 +8,22 @@
 // Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) AUTHOR
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-

 #ifdef __GNUG__
 #pragma implementation "choice.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "choice.h"
 #endif

-
-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"

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

-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif

-
-short nextMenuId = 100 ; // wxMenu takes the lower ids
-
+extern MenuHandle NewUniqueMenu() ;

 wxChoice::~wxChoice()
 {
        // DeleteMenu( m_macPopUpMenuId ) ;
 wxChoice::~wxChoice()
 {
        // DeleteMenu( m_macPopUpMenuId ) ;

-       DisposeMenu( m_macPopUpMenuHandle ) ;
+       // DisposeMenu( m_macPopUpMenuHandle ) ;

 }
 }

-
-int wxChoice::GetCount() const {
-       return m_strings.Count() ;
-}
-
-void wxChoice::SetString( int n , const wxString& s ) {
-       m_strings[n] = s ;
-}
-

 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,


@@ -46,131 +32,198 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-

                Rect bounds ;
                Str255 title ;
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
                Rect bounds ;
                Str255 title ;
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;

-
-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
-               m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0 , 
+               m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 , 

                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (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++ )
-               {
-                       Str255 label;
-                       wxMenuItem::MacBuildMenuString( label , NULL , NULL , choices[i] ,false);
-                       AppendMenu( m_macPopUpMenuHandle , label ) ;
-                       m_strings.Add( choices[i] ) ;
-                       m_dataArray.Add( NULL );
-               }
-               SetControlMinimum( m_macControl , 0 ) ;
-               SetControlMaximum( m_macControl , Number()) ;
+               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 )
                if ( n > 0 )

-                       SetControlValue( m_macControl , 1 ) ;
-
+                       SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;

                MacPostControlCreate() ;
                MacPostControlCreate() ;

-
+    for ( int i = 0; i < n; i++ )
+    {
+        Append(choices[i]);
+    }

        return TRUE;
 }
        return TRUE;
 }

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

 int wxChoice::DoAppend(const wxString& item)
 {
        Str255 label;
        wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
 int wxChoice::DoAppend(const wxString& item)
 {
        Str255 label;
        wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);

-       AppendMenu( m_macPopUpMenuHandle , label ) ;
+       MacAppendMenu(MAC_WXHMENU( m_macPopUpMenuHandle ) , "\pA");
+       SetMenuItemText(MAC_WXHMENU( m_macPopUpMenuHandle ) , 
+           (SInt16) ::CountMenuItems(MAC_WXHMENU( m_macPopUpMenuHandle ) ), label);
+       // was AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;

        m_strings.Add( item ) ;
        m_strings.Add( item ) ;

-       m_dataArray.Add( NULL );
-       return m_strings.Count() ;
+       m_datas.Add( NULL ) ;
+       int index = m_strings.GetCount()  - 1  ;
+       DoSetItemClientData( index , NULL ) ;
+       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+       return index ;

 }
 }

-
-void *wxChoice::DoGetItemClientData(int N) const
-{
-    return (void *)m_dataArray[N];
-}
-
-void wxChoice::DoSetItemClientData( int N, void* Client_data ) 
+void wxChoice::Delete(int n)

 {
 {

-       wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
-       
-       if ( m_dataArray.GetCount() > N )
-       {
-       m_dataArray[N] = (char*) Client_data ;
-    }
-    else
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+    if ( HasClientObjectData() )

     {
     {

-       m_dataArray.Add( (char*) Client_data ) ;
+        delete GetClientObject(n);

     }
     }

-}
-
-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    DoSetItemClientData(n, clientData);
-}
-
-wxClientData* wxChoice::DoGetItemClientObject( int N ) const
-{
-       return (wxClientData *) DoGetItemClientData( N ) ;
-}
-
-void wxChoice::Delete(int n)
-{
-    ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
+    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;

     m_strings.Remove( n ) ;
     m_strings.Remove( n ) ;

-       m_dataArray.Remove( n ) ;
-       SetControlMaximum( m_macControl , Number()) ;
+    m_datas.RemoveAt( n ) ;
+       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;

 }
 }

-

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

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

     {
     {

-       ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-       }
-    m_strings.Clear() ;
-       m_dataArray.Empty() ;
-       SetControlMaximum( m_macControl , Number()) ;
+       ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+    }
+    m_strings.Empty() ;
+    m_datas.Empty() ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;

 }
 }

-
-int wxChoice::GetSelection() const
+void wxChoice::FreeData()

 {
 {

-    return GetControlValue( m_macControl ) -1 ;
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }

 }
 }

-
-void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+int wxChoice::GetSelection() const

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
-       event.SetInt(GetSelection());
-    event.SetEventObject(this);
-    event.SetString(GetStringSelection());
-    ProcessCommand(event);
+    return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;

 }
 }

-
-

 void wxChoice::SetSelection(int n)
 {
 void wxChoice::SetSelection(int n)
 {

-    SetControlValue( m_macControl , n + 1 ) ;
+    SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
+}
+// ----------------------------------------------------------------------------
+// string list functions
+// ----------------------------------------------------------------------------
+int wxChoice::GetCount() const
+{
+    return m_strings.GetCount() ;

 }
 }

-

 int wxChoice::FindString(const wxString& s) const
 {
 int wxChoice::FindString(const wxString& s) const
 {

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

     {
     {

-       if ( GetString( i ) == s )
+       if ( GetString( i ).IsSameAs(s, FALSE) )

                return i ; 
     }
                return i ; 
     }

-    return -1;
+    return wxNOT_FOUND ;
+}
+void wxChoice::SetString(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

 }
 
 wxString wxChoice::GetString(int n) const
 {
        return m_strings[n] ;
 }
 }
 
 wxString wxChoice::GetString(int n) const
 {
        return m_strings[n] ;
 }

-
-void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+void wxChoice::DoSetItemClientData( int n, void* clientData )

 {
 {

-  wxControl::SetSize( x,y,width,height,sizeFlags ) ;
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
+                 "invalid index in wxChoice::SetClientData" );
+       
+    m_datas[n] = (char*) clientData ;

 }
 }

-
+void *wxChoice::DoGetItemClientData(int n) const
+{
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
+                 "invalid index in wxChoice::GetClientData" );
+    return (void *)m_datas[n];
+}
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+{
+    DoSetItemClientData(n, clientData);
+}
+wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+{
+    return (wxClientData *)DoGetItemClientData(n);
+}
+void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+{
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+    int n = GetSelection();
+    // actually n should be made sure by the os to be a valid selection, but ...
+    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);
+    }
+}
+wxSize wxChoice::DoGetBestSize() const
+{
+    int lbWidth = 100;  // some defaults
+    int lbHeight = 20;
+    int wLine;
+#if TARGET_CARBON
+    long metric ;
+    GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );   
+    lbHeight = metric ; 
+#endif
+       {
+               wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
+               Rect drawRect ;
+               wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+               if ( font )
+               {
+                       ::TextFont( font->m_macFontNum ) ;
+                       ::TextSize( short(font->m_macFontSize) ) ;
+                       ::TextFace( font->m_macFontStyle ) ;
+               }
+               else
+               {
+               ::TextFont( kFontIDMonaco ) ;
+               ::TextSize( 9  );
+               ::TextFace( 0 ) ;
+               }
+           // Find the widest line
+           for(int i = 0; i < GetCount(); i++) {
+               wxString str(GetString(i));
+               wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
+               lbWidth = wxMax(lbWidth, wLine);
+           }
+           // Add room for the popup arrow
+           lbWidth += 2 * lbHeight ;
+           // And just a bit more
+           int cy = 12 ;
+           int cx = ::TextWidth( "X" , 0 , 1 ) ;
+           lbWidth += cx ;
+           
+       }
+    return wxSize(lbWidth, lbHeight);
+}
\ No newline at end of file