corrected a bug in dc which resetted the port , exchanged the wxchoice implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 335bebd869d45f520ddb1657301f8d1b6a0e98dc..01faf5e769fa27beec73d00f3a5819ff060329ea 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -88,15 +88,11 @@ protected:
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-

     // free all memory we have (used by Clear() and dtor)
     void Free();
 
   wxArrayString m_strings;
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
   wxArrayString m_strings;

-  wxChoiceDataArray m_dataArray ;
+  wxChoiceDataArray m_datas ;

   MenuHandle   m_macPopUpMenuHandle ;
 };
 
   MenuHandle   m_macPopUpMenuHandle ;
 };
 

diff --git a/src/mac/aga.cpp b/src/mac/aga.cpp
index 572caed82a5c41215c718e61a06dd9146efb8563..9a752cbe6d9fe609844955e65a3f0605cfeef32e 100644 (file)
--- a/src/mac/aga.cpp
+++ b/src/mac/aga.cpp
@@ -2586,7 +2586,7 @@ void AGAPortHelper::Setup( GrafPtr newport )
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;

-
+       wxASSERT( clip == NULL ) ;

        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);
        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);


@@ -2608,6 +2608,7 @@ AGAPortHelper::~AGAPortHelper()
        if ( clip )
        {
                SetPort( nport ) ;
        if ( clip )
        {
                SetPort( nport ) ;

+               PenNormal() ;

                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);
                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);

diff --git a/src/mac/carbon/aga.cpp b/src/mac/carbon/aga.cpp
index 572caed82a5c41215c718e61a06dd9146efb8563..9a752cbe6d9fe609844955e65a3f0605cfeef32e 100644 (file)
--- a/src/mac/carbon/aga.cpp
+++ b/src/mac/carbon/aga.cpp
@@ -2586,7 +2586,7 @@ void AGAPortHelper::Setup( GrafPtr newport )
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;
        GetPenState( &oldPenState ) ;
        GetBackColor( &oldBackColor ) ;
        GetForeColor( &oldForeColor ) ;

-
+       wxASSERT( clip == NULL ) ;

        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);
        clip = NewRgn() ;
        GetClip( clip );
        font = GetPortTextFont( newport);


@@ -2608,6 +2608,7 @@ AGAPortHelper::~AGAPortHelper()
        if ( clip )
        {
                SetPort( nport ) ;
        if ( clip )
        {
                SetPort( nport ) ;

+               PenNormal() ;

                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);
                SetClip( clip ) ;
                DisposeRgn( clip ) ;
                RGBForeColor(&oldForeColor);

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index bac3579f34d1a7d6822065b6f561612cac20b802..9c4e7d94a9861a9dc33492cecc1dfd56040f7e57 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -30,14 +30,6 @@ wxChoice::~wxChoice()
        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,


@@ -52,125 +44,180 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , 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 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0 , 
                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()) ;
+               SetControlMinimum( m_macControl , 0 ) ;
+               SetControlMaximum( m_macControl , 0) ;

                if ( n > 0 )
                        SetControlValue( m_macControl , 1 ) ;
 
                MacPostControlCreate() ;
 
                if ( n > 0 )
                        SetControlValue( m_macControl , 1 ) ;
 
                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);
        AppendMenu( m_macPopUpMenuHandle , label ) ;
        m_strings.Add( item ) ;
 int wxChoice::DoAppend(const wxString& item)
 {
        Str255 label;
        wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
        AppendMenu( m_macPopUpMenuHandle , label ) ;
        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 ) ;
+       SetControlMaximum( m_macControl , Number()) ;
+       return index ;

 }
 
 }
 

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

 {
 {

-    return (void *)m_dataArray[N];
-}
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );

 
 

-void wxChoice::DoSetItemClientData( int N, void* Client_data ) 
-{
-       wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
-       
-       if ( m_dataArray.GetCount() > N )
-       {
-       m_dataArray[N] = (char*) Client_data ;
-    }
-    else
+    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) ;
     m_strings.Remove( n ) ;
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;

-       m_dataArray.Remove( n ) ;
-       SetControlMaximum( m_macControl , Number()) ;
+         SetControlMaximum( m_macControl , Number()) ;

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

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

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

-       }
-    m_strings.Clear() ;
-       m_dataArray.Empty() ;
-       SetControlMaximum( m_macControl , Number()) ;
+         }
+    m_strings.Empty() ;
+    m_datas.Empty() ;
+         SetControlMaximum( m_macControl , 0 ) ;

 }
 
 }
 

+void wxChoice::Free()
+{
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+

 int wxChoice::GetSelection() const
 {
     return GetControlValue( m_macControl ) -1 ;
 }
 
 int wxChoice::GetSelection() const
 {
     return GetControlValue( m_macControl ) -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);
+    SetControlValue( m_macControl , n + 1 ) ;

 }
 
 }
 

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

 
 

-void wxChoice::SetSelection(int n)
+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) 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("not 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 )
+{
+    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 ) ;
+    }
+}
+
+void *wxChoice::DoGetItemClientData(int N) const
+{
+    wxCHECK_MSG( N >= 0 && 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

 {
 {

-  wxControl::SetSize( x,y,width,height,sizeFlags ) ;
+    return (wxClientData *)DoGetItemClientData(n);

 }
 
 }
 

+void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+         event.SetInt(GetSelection());
+    event.SetEventObject(this);
+    event.SetString(GetStringSelection());
+    ProcessCommand(event);
+}
+/*
+void wxChoice::Command(wxCommandEvent & event)
+{
+    SetSelection (event.GetInt());
+    ProcessCommand (event);
+}
+*/

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 8285afd1c686e983ab0d3e0269956ff0ea9665fa..9daa29987f95815d520a679f757795ec6d06abd2 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -103,7 +103,7 @@ wxDC::~wxDC(void)
 
 void wxDC::MacSetupPort(AGAPortHelper* help) const
 {
 
 void wxDC::MacSetupPort(AGAPortHelper* help) const
 {

-       help->Setup( m_macPort ) ;
+//     help->Setup( m_macPort ) ;

        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
        ::ClipRect(&m_macClipRect);
 
        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
        ::ClipRect(&m_macClipRect);
 

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index bac3579f34d1a7d6822065b6f561612cac20b802..9c4e7d94a9861a9dc33492cecc1dfd56040f7e57 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -30,14 +30,6 @@ wxChoice::~wxChoice()
        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,


@@ -52,125 +44,180 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , 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 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0 , 
                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()) ;
+               SetControlMinimum( m_macControl , 0 ) ;
+               SetControlMaximum( m_macControl , 0) ;

                if ( n > 0 )
                        SetControlValue( m_macControl , 1 ) ;
 
                MacPostControlCreate() ;
 
                if ( n > 0 )
                        SetControlValue( m_macControl , 1 ) ;
 
                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);
        AppendMenu( m_macPopUpMenuHandle , label ) ;
        m_strings.Add( item ) ;
 int wxChoice::DoAppend(const wxString& item)
 {
        Str255 label;
        wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
        AppendMenu( m_macPopUpMenuHandle , label ) ;
        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 ) ;
+       SetControlMaximum( m_macControl , Number()) ;
+       return index ;

 }
 
 }
 

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

 {
 {

-    return (void *)m_dataArray[N];
-}
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );

 
 

-void wxChoice::DoSetItemClientData( int N, void* Client_data ) 
-{
-       wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
-       
-       if ( m_dataArray.GetCount() > N )
-       {
-       m_dataArray[N] = (char*) Client_data ;
-    }
-    else
+    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) ;
     m_strings.Remove( n ) ;
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;

-       m_dataArray.Remove( n ) ;
-       SetControlMaximum( m_macControl , Number()) ;
+         SetControlMaximum( m_macControl , Number()) ;

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

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

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

-       }
-    m_strings.Clear() ;
-       m_dataArray.Empty() ;
-       SetControlMaximum( m_macControl , Number()) ;
+         }
+    m_strings.Empty() ;
+    m_datas.Empty() ;
+         SetControlMaximum( m_macControl , 0 ) ;

 }
 
 }
 

+void wxChoice::Free()
+{
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+

 int wxChoice::GetSelection() const
 {
     return GetControlValue( m_macControl ) -1 ;
 }
 
 int wxChoice::GetSelection() const
 {
     return GetControlValue( m_macControl ) -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);
+    SetControlValue( m_macControl , n + 1 ) ;

 }
 
 }
 

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

 
 

-void wxChoice::SetSelection(int n)
+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) 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("not 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 )
+{
+    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 ) ;
+    }
+}
+
+void *wxChoice::DoGetItemClientData(int N) const
+{
+    wxCHECK_MSG( N >= 0 && 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

 {
 {

-  wxControl::SetSize( x,y,width,height,sizeFlags ) ;
+    return (wxClientData *)DoGetItemClientData(n);

 }
 
 }
 

+void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+         event.SetInt(GetSelection());
+    event.SetEventObject(this);
+    event.SetString(GetStringSelection());
+    ProcessCommand(event);
+}
+/*
+void wxChoice::Command(wxCommandEvent & event)
+{
+    SetSelection (event.GetInt());
+    ProcessCommand (event);
+}
+*/

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 8285afd1c686e983ab0d3e0269956ff0ea9665fa..9daa29987f95815d520a679f757795ec6d06abd2 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -103,7 +103,7 @@ wxDC::~wxDC(void)
 
 void wxDC::MacSetupPort(AGAPortHelper* help) const
 {
 
 void wxDC::MacSetupPort(AGAPortHelper* help) const
 {

-       help->Setup( m_macPort ) ;
+//     help->Setup( m_macPort ) ;

        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
        ::ClipRect(&m_macClipRect);
 
        ::SetOrigin(-m_macLocalOrigin.h, -m_macLocalOrigin.v);
        ::ClipRect(&m_macClipRect);