more informative error messages

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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index a88ecc17a1e136758aa963ebe612789ae94567c0..863b944cb4deed30a7f134c003ed2cfe847d6496 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.cpp
 // Purpose:     wxChoice
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.cpp
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,7 +14,6 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #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"


@@ -27,82 +26,80 @@ extern MenuHandle NewUniqueMenu() ;
 
 wxChoice::~wxChoice()
 {
 
 wxChoice::~wxChoice()
 {

-       // DeleteMenu( m_macPopUpMenuId ) ;
-       // DisposeMenu( m_macPopUpMenuHandle ) ;
+    if ( HasClientObjectData() )
+    {
+        size_t 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,
 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,

-                  int n, const wxString choices[],
-                  long style,
+           int n, const wxString choices[],
+           long style,

            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 ) ;
-
-               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() ;
-
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  "" , 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]);
     }
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
     }

-       return TRUE;
+    return TRUE;

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

-

 int wxChoice::DoAppend(const wxString& item)
 {
 int wxChoice::DoAppend(const wxString& item)
 {

-       Str255 label;
-       wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
-       AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
-       m_strings.Add( item ) ;
-       m_datas.Add( NULL ) ;
-       int index = m_strings.GetCount()  - 1  ;
-       DoSetItemClientData( index , NULL ) ;
-       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
-       return index ;
+    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 ;

 }
 
 void wxChoice::Delete(int n)
 {
     wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
 }
 
 void wxChoice::Delete(int n)
 {
     wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );

-

     if ( HasClientObjectData() )
     {
         delete GetClientObject(n);
     }
     if ( HasClientObjectData() )
     {
         delete GetClientObject(n);
     }

-

     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.RemoveAt( n ) ;
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.RemoveAt( n ) ;

-       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;

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

-

     for ( int i = 0 ; i < GetCount() ; i++ )
     {
     for ( 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() ;


@@ -124,7 +121,6 @@ void wxChoice::FreeData()
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------

-

 int wxChoice::GetSelection() const
 {
     return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
 int wxChoice::GetSelection() const
 {
     return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;


@@ -148,8 +144,8 @@ int wxChoice::FindString(const wxString& s) const
 {
     for( int i = 0 ; i < GetCount() ; i++ )
     {
 {
     for( int i = 0 ; i < GetCount() ; i++ )
     {

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

     }
     return wxNOT_FOUND ;
 }
     }
     return wxNOT_FOUND ;
 }


@@ -157,45 +153,32 @@ int wxChoice::FindString(const wxString& s) const
 void wxChoice::SetString(int n, const wxString& s)
 {
     wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
 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
 }
 
 #if 0 // should do this, but no Insert() so far
     Delete(n);
     Insert(n + 1, s);
 #endif
 }
 

-

 wxString wxChoice::GetString(int n) const
 {
 wxString wxChoice::GetString(int n) const
 {

-       return m_strings[n] ;
+    return m_strings[n] ;

 }
 }

-

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

-

 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {

-    wxCHECK_RET( n >= 0 && n < m_datas.GetCount(),
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),

                  "invalid index in wxChoice::SetClientData" );
                  "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 ) ;
-    }
+    
+    m_datas[n] = (char*) clientData ;

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,

                  "invalid index in wxChoice::GetClientData" );
                  "invalid index in wxChoice::GetClientData" );

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

 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )


@@ -211,22 +194,60 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );

-         event.SetInt(GetSelection());
-    event.SetEventObject(this);
-    event.SetString(GetStringSelection());
-    ProcessCommand(event);
+    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
 {
 }
 
 wxSize wxChoice::DoGetBestSize() const
 {

-    // TODO should modify this to take into account string length ala wxGTK
-    return wxSize(100,20);
-}
-
-/*
-void wxChoice::Command(wxCommandEvent & event)
-{
-    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) 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);

 }
 }

-*/