cleanup

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

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 8f1e122bd0384facebe895b18c9dbc412312c318..dc03529a981e4af5b46ceb1fab8e8757cbc2a2f2 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.cpp
-// Purpose:     wxComboBox class
+// Name:        src/mac/carbon/combobxc.cpp
+// Purpose:     wxComboBox class using HIView ComboBox

 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01


@@ -9,25 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+#include "wx/wxprec.h"

 
 #include "wx/combobox.h"
 
 #include "wx/combobox.h"

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

 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__
 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__

-       #include <HIToolbox/HIView.h>
+    #include <HIToolbox/HIView.h>

 #endif
 #endif
 
 #endif
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif
-
-// composite combobox implementation by Dan "Bud" Keith bud@otsys.com

 
 #if TARGET_API_MAC_OSX
 #define USE_HICOMBOBOX 1 //use hi combobox define
 
 #if TARGET_API_MAC_OSX
 #define USE_HICOMBOBOX 1 //use hi combobox define


@@ -35,14 +33,56 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #define USE_HICOMBOBOX 0
 #endif
 
 #define USE_HICOMBOBOX 0
 #endif
 

-static int nextPopUpMenuId = 1000 ;
-MenuHandle NewUniqueMenu() 
+static int nextPopUpMenuId = 1000;
+MenuHandle NewUniqueMenu()

 {
 {

-  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
-  nextPopUpMenuId++ ;
-  return handle ;
+  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" );
+  nextPopUpMenuId++;
+  return handle;
+}
+
+#if USE_HICOMBOBOX
+static const EventTypeSpec eventList[] =
+{
+    { kEventClassTextField , kEventTextAccepted } ,
+};
+
+static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr;
+    wxComboBox* cb = (wxComboBox*) data;
+
+    wxMacCarbonEvent cEvent( event );
+
+    switch( cEvent.GetClass() )
+    {
+        case kEventClassTextField :
+            switch( cEvent.GetKind() )
+            {
+                case kEventTextAccepted :
+                    {
+                        wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, cb->GetId() );
+                        event.SetInt( cb->GetSelection() );
+                        event.SetString( cb->GetStringSelection() );
+                        event.SetEventObject( cb );
+                        cb->GetEventHandler()->ProcessEvent( event );
+                    }
+                    break;
+                default :
+                    break;
+            }
+            break;
+        default :
+            break;
+    }
+
+
+    return result;

 }
 
 }
 

+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacComboBoxEventHandler )
+
+#endif

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -107,27 +147,23 @@ protected:
                 // This will invoke the dialog default action, such
                 // as the clicking the default button.
 
                 // This will invoke the dialog default action, such
                 // as the clicking the default button.
 

-                wxWindow *parent = GetParent();
-                while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
-                    parent = parent->GetParent() ;
-                }
-                if ( parent && parent->GetDefaultItem() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )

                 {
                 {

-                    wxButton *def = wxDynamicCast(parent->GetDefaultItem(),
-                                                          wxButton);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);

                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                     if ( def && def->IsEnabled() )
                     {
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);

-                        return ;
-                   }
+                        return;
+                    }

                 }
 
                 return;
             }
         }
                 }
 
                 return;
             }
         }

-        
+

         event.Skip();
     }
 private:
         event.Skip();
     }
 private:


@@ -163,10 +199,10 @@ protected:
     }
     virtual wxSize DoGetBestSize() const
     {
     }
     virtual wxSize DoGetBestSize() const
     {

-        wxSize sz = wxChoice::DoGetBestSize() ;
-        sz.x = POPUPWIDTH ;
-        return sz ;
-    }  
+        wxSize sz = wxChoice::DoGetBestSize();
+        sz.x = POPUPWIDTH;
+        return sz;
+    }

 
 private:
     wxComboBox *m_cb;
 
 private:
     wxComboBox *m_cb;


@@ -175,7 +211,7 @@ private:
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
 };
 
 BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)

-    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+    EVT_CHOICE(wxID_ANY, wxComboBoxChoice::OnChoice)

 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()
 END_EVENT_TABLE()
 
 wxComboBox::~wxComboBox()


@@ -204,14 +240,14 @@ wxComboBox::~wxComboBox()
 wxSize wxComboBox::DoGetBestSize() const
 {
 #if USE_HICOMBOBOX
 wxSize wxComboBox::DoGetBestSize() const
 {
 #if USE_HICOMBOBOX

-       return wxControl::DoGetBestSize();
+    return wxControl::DoGetBestSize();

 #else
     wxSize size = m_choice->GetBestSize();
 #else
     wxSize size = m_choice->GetBestSize();

-    
+

     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();
     if ( m_text != NULL )
     {
         wxSize  sizeText = m_text->GetBestSize();

-        
+

         size.x = POPUPWIDTH + sizeText.x + MARGIN;
     }
 
         size.x = POPUPWIDTH + sizeText.x + MARGIN;
     }
 


@@ -221,25 +257,25 @@ wxSize wxComboBox::DoGetBestSize() const
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 #if USE_HICOMBOBOX
 
 void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 #if USE_HICOMBOBOX

-       wxControl::DoMoveWindow(x, y, width, height);
+    wxControl::DoMoveWindow(x, y, width, height);

 #else
     height = POPUPHEIGHT;
 #else
     height = POPUPHEIGHT;

-    
+

     wxControl::DoMoveWindow(x, y, width, height);
 
     if ( m_text == NULL )
     {
         // we might not be fully constructed yet, therefore watch out...
         if ( m_choice )
     wxControl::DoMoveWindow(x, y, width, height);
 
     if ( m_text == NULL )
     {
         // we might not be fully constructed yet, therefore watch out...
         if ( m_choice )

-            m_choice->SetSize(0, 0 , width, -1);
+            m_choice->SetSize(0, 0 , width, wxDefaultCoord);

     }
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
         m_text->SetSize(0, 0, wText, height);
     }
     else
     {
         wxCoord wText = width - POPUPWIDTH - MARGIN;
         m_text->SetSize(0, 0, wText, height);

-        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, wxDefaultCoord);

     }
     }

-#endif    
+#endif

 }
 
 
 }
 
 


@@ -251,23 +287,23 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxComboBox::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxComboBox::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxComboBox::SetFocus()
 {
 #if USE_HICOMBOBOX
 }
 
 void wxComboBox::SetFocus()
 {
 #if USE_HICOMBOBOX

-       wxControl::SetFocus();
+    wxControl::SetFocus();

 #else
     if ( m_text != NULL) {
         m_text->SetFocus();
 #else
     if ( m_text != NULL) {
         m_text->SetFocus();


@@ -316,51 +352,57 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     m_text = NULL;
     m_choice = NULL;
 #if USE_HICOMBOBOX
     m_text = NULL;
     m_choice = NULL;
 #if USE_HICOMBOBOX

-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false;

 #endif
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {
 #endif
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
     {

-        return FALSE;
+        return false;

     }
 #if USE_HICOMBOBOX
     }
 #if USE_HICOMBOBOX

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size );

     HIRect hiRect;
     HIRect hiRect;

-    
+

     hiRect.origin.x = 20; //bounds.left;
     hiRect.origin.y = 25; //bounds.top;
     hiRect.size.width = 120;// bounds.right - bounds.left;
     hiRect.origin.x = 20; //bounds.left;
     hiRect.origin.y = 25; //bounds.top;
     hiRect.size.width = 120;// bounds.right - bounds.left;

-    hiRect.size.height = 24; 
-       
+    hiRect.size.height = 24;
+

     //For some reason, this code causes the combo box not to be displayed at all.
     //hiRect.origin.x = bounds.left;
     //hiRect.origin.y = bounds.top;
     //hiRect.size.width = bounds.right - bounds.left;
     //hiRect.size.height = bounds.bottom - bounds.top;
     //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);
     //For some reason, this code causes the combo box not to be displayed at all.
     //hiRect.origin.x = bounds.left;
     //hiRect.origin.y = bounds.top;
     //hiRect.size.width = bounds.right - bounds.left;
     //hiRect.size.height = bounds.bottom - bounds.top;
     //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);

-       //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);
-    verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, (HIViewRef*) &m_macControl) );
+    //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);
+    m_peer = new wxMacControl(this);
+    verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, m_peer->GetControlRefAddr() ) );
+

 
 

-    SetControl32BitMinimum( (ControlRef) m_macControl , 0 ) ;
-    SetControl32BitMaximum( (ControlRef) m_macControl , 100) ;
+    m_peer->SetMinimum( 0 );
+    m_peer->SetMaximum( 100);

     if ( n > 0 )
     if ( n > 0 )

-        SetControl32BitValue( (ControlRef) m_macControl , 1 ) ;
-    
-    MacPostControlCreate(pos,size) ;
-    
-    for ( int i = 0 ; i < n ; i++ )
+        m_peer->SetValue( 1 );
+
+    MacPostControlCreate(pos,size);
+
+    for ( int i = 0; i < n; i++ )

     {
         DoAppend( choices[ i ] );
     }
     {
         DoAppend( choices[ i ] );
     }

-    
-    HIViewSetVisible( (HIViewRef) m_macControl, true );
+
+    HIViewSetVisible( m_peer->GetControlRef(), true );

     SetSelection(0);
     SetSelection(0);

+    EventHandlerRef comboEventHandler;
+    InstallControlEventHandler( m_peer->GetControlRef(), GetwxMacComboBoxEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this,
+        (EventHandlerRef *)&comboEventHandler);

 #else
     m_choice = new wxComboBoxChoice(this, style );
 
     m_choice = new wxComboBoxChoice(this, style );
 #else
     m_choice = new wxComboBoxChoice(this, style );
 
     m_choice = new wxComboBoxChoice(this, style );

-    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;
-    
+    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) );
+

     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {


@@ -369,32 +411,32 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     else
     {
         m_text = new wxComboBoxText(this);
     else
     {
         m_text = new wxComboBoxText(this);

-        if ( size.y == -1 ) {
-          csize.y = m_text->GetSize().y ;
+        if ( size.y == wxDefaultCoord ) {
+          csize.y = m_text->GetSize().y;

         }
     }
         }
     }

-    
+

     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     DoSetSize(pos.x, pos.y, csize.x, csize.y);

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

     {
         m_choice->DoAppend( choices[ i ] );
     }
     SetBestSize(csize);   // Needed because it is a wxControlWithItems
 #endif
 
     {
         m_choice->DoAppend( choices[ i ] );
     }
     SetBestSize(csize);   // Needed because it is a wxControlWithItems
 #endif
 

-    return TRUE;
+    return true;

 }
 
 wxString wxComboBox::GetValue() const
 {
 #if USE_HICOMBOBOX
     CFStringRef myString;
 }
 
 wxString wxComboBox::GetValue() const
 {
 #if USE_HICOMBOBOX
     CFStringRef myString;

-    HIComboBoxCopyTextItemAtIndex( (HIViewRef) m_macControl, (CFIndex)GetSelection(), &myString );
+    HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString );

     return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
 #else
     wxString        result;
     return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
 #else
     wxString        result;

-    
+

     if ( m_text == NULL )
     {
         result = m_choice->GetString( m_choice->GetSelection() );
     if ( m_text == NULL )
     {
         result = m_choice->GetString( m_choice->GetSelection() );


@@ -403,7 +445,7 @@ wxString wxComboBox::GetValue() const
     {
         result = m_text->GetValue();
     }
     {
         result = m_text->GetValue();
     }

-    
+

     return result;
 #endif
 }
     return result;
 #endif
 }


@@ -411,14 +453,14 @@ wxString wxComboBox::GetValue() const
 void wxComboBox::SetValue(const wxString& value)
 {
 #if USE_HICOMBOBOX
 void wxComboBox::SetValue(const wxString& value)
 {
 #if USE_HICOMBOBOX

-    
+

 #else
     int s = FindString (value);
     if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
     {
 #else
     int s = FindString (value);
     if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
     {

-        m_choice->Append(value) ;
+        m_choice->Append(value);

     }
     }

-    SetStringSelection( value ) ;
+    SetStringSelection( value );

 #endif
 }
 
 #endif
 }
 


@@ -461,7 +503,7 @@ void wxComboBox::SetEditable(bool editable)
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );
 
     int currentX, currentY;
     GetPosition( &currentX, &currentY );

-    
+

     int currentW, currentH;
     GetSize( &currentW, &currentH );
 
     int currentW, currentH;
     GetSize( &currentW, &currentH );
 


@@ -484,7 +526,7 @@ long wxComboBox::GetInsertionPoint() const
     return 0;
 }
 
     return 0;
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;


@@ -505,91 +547,91 @@ void wxComboBox::SetSelection(long from, long to)
     // TODO
 }
 
     // TODO
 }
 

-int wxComboBox::DoAppend(const wxString& item) 
+int wxComboBox::DoAppend(const wxString& item)

 {
 #if USE_HICOMBOBOX
     CFIndex outIndex;
 {
 #if USE_HICOMBOBOX
     CFIndex outIndex;

-    HIComboBoxAppendTextItem( (HIViewRef) m_macControl, wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex );
-    //SetControl32BitMaximum( (HIViewRef) m_macControl, GetCount() );
+    HIComboBoxAppendTextItem( m_peer->GetControlRef(), wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex );
+    //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() );

     return (int) outIndex;
 #else
     return (int) outIndex;
 #else

-    return m_choice->DoAppend( item ) ;
+    return m_choice->DoAppend( item );

 #endif
 }
 
 #endif
 }
 

-int wxComboBox::DoInsert(const wxString& item, int pos) 
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    HIComboBoxInsertTextItemAtIndex( (HIViewRef) m_macControl, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );
-    
-    //SetControl32BitMaximum( (HIViewRef) m_macControl, GetCount() );
-    
+    HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );
+
+    //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() );
+

     return pos;
 #else
     return pos;
 #else

-    return m_choice->DoInsert( item , pos ) ;
+    return m_choice->DoInsert( item , pos );

 #endif
 }
 
 #endif
 }
 

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

 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else
 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else

-    return m_choice->DoSetItemClientData( n , clientData ) ;
+    return m_choice->DoSetItemClientData( n , clientData );

 #endif
 }
 
 #endif
 }
 

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

 {
 #if USE_HICOMBOBOX
     return NULL; //TODO
 #else
 {
 #if USE_HICOMBOBOX
     return NULL; //TODO
 #else

-    return m_choice->DoGetItemClientData( n ) ;
+    return m_choice->DoGetItemClientData( n );

 #endif
 }
 
 #endif
 }
 

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

 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else
 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else

-    return m_choice->DoSetItemClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject( n , clientData );

 #endif
 }
 
 #endif
 }
 

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

 {
 #if USE_HICOMBOBOX
     return NULL;
 #else
 {
 #if USE_HICOMBOBOX
     return NULL;
 #else

-    return m_choice->DoGetItemClientObject( n ) ;
+    return m_choice->DoGetItemClientObject( n );

 #endif
 }
 
 void wxComboBox::FreeData()
 {
 #endif
 }
 
 void wxComboBox::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++ )

         {
             SetClientObject( n, NULL );
         }
     }
 }
 
         {
             SetClientObject( n, NULL );
         }
     }
 }
 

-int wxComboBox::GetCount() const {
+unsigned int wxComboBox::GetCount() const {

 #if USE_HICOMBOBOX
 #if USE_HICOMBOBOX

-       return (int) HIComboBoxGetItemCount( (HIViewRef) m_macControl );
+    return (unsigned int) HIComboBoxGetItemCount( m_peer->GetControlRef() );

 #else
 #else

-       return m_choice->GetCount() ; 
+    return m_choice->GetCount();

 #endif
 }
 
 #endif
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    HIComboBoxRemoveItemAtIndex( (HIViewRef) m_macControl, (CFIndex)n );
+    HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex)n );

 #else
     // force client object deletion
     if( HasClientObjectData() )
 #else
     // force client object deletion
     if( HasClientObjectData() )


@@ -602,12 +644,9 @@ void wxComboBox::Clear()
 {
     FreeData();
 #if USE_HICOMBOBOX
 {
     FreeData();
 #if USE_HICOMBOBOX

-    for ( CFIndex i = GetCount() - 1 ; i >= 0 ; ++ i )
-        verify_noerr( HIComboBoxRemoveItemAtIndex( (HIViewRef) m_macControl, i ) );
-    wxMacCFStringHolder cf(wxEmptyString,m_font.GetEncoding()) ;
-    CFStringRef cfr = cf ;
-    SetControlData((ControlRef) m_macControl,kHIComboBoxEditTextPart,kControlEditTextCFStringTag, 
-           sizeof(CFStringRef),(Ptr) &cfr);
+    for ( CFIndex i = GetCount() - 1; i >= 0; ++ i )
+        verify_noerr( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), i ) );
+    m_peer->SetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag,CFSTR(""));

 #else
     m_choice->Clear();
 #endif
 #else
     m_choice->Clear();
 #endif


@@ -616,7 +655,7 @@ void wxComboBox::Clear()
 int wxComboBox::GetSelection() const
 {
 #if USE_HICOMBOBOX
 int wxComboBox::GetSelection() const
 {
 #if USE_HICOMBOBOX

-    return FindString( GetStringSelection() ) ;
+    return FindString( GetStringSelection() );

 #else
     return m_choice->GetSelection();
 #endif
 #else
     return m_choice->GetSelection();
 #endif


@@ -625,36 +664,36 @@ int wxComboBox::GetSelection() const
 void wxComboBox::SetSelection(int n)
 {
 #if USE_HICOMBOBOX
 void wxComboBox::SetSelection(int n)
 {
 #if USE_HICOMBOBOX

-    SetControl32BitValue( (ControlRef) m_macControl , n + 1 ) ;
+    SetControl32BitValue( m_peer->GetControlRef() , n + 1 );

 #else
     m_choice->SetSelection( n );
 #else
     m_choice->SetSelection( n );

-    
+

     if ( m_text != NULL )
     {
     if ( m_text != NULL )
     {

-        m_text->SetValue( GetString( n ) );
+        m_text->SetValue(GetString(n));

     }
 #endif
 }
 
     }
 #endif
 }
 

-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase) const

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

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

     {
     {

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

             return i ;
     }
             return i ;
     }

-    return wxNOT_FOUND ;
+    return wxNOT_FOUND;

 #else
 #else

-    return m_choice->FindString( s );
+    return m_choice->FindString( s, bCase );

 #endif
 }
 
 #endif
 }
 

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

 {
 #if USE_HICOMBOBOX
     CFStringRef itemText;
 {
 #if USE_HICOMBOBOX
     CFStringRef itemText;

-    HIComboBoxCopyTextItemAtIndex( (HIViewRef) m_macControl, (CFIndex)n, &itemText );
+    HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)n, &itemText );

     return wxMacCFStringHolder(itemText).AsString();
 #else
     return m_choice->GetString( n );
     return wxMacCFStringHolder(itemText).AsString();
 #else
     return m_choice->GetString( n );


@@ -664,52 +703,138 @@ wxString wxComboBox::GetString(int n) const
 wxString wxComboBox::GetStringSelection() const
 {
 #if USE_HICOMBOBOX
 wxString wxComboBox::GetStringSelection() const
 {
 #if USE_HICOMBOBOX

-    CFStringRef cfr ;
-    verify_noerr(GetControlData((ControlRef) m_macControl,kHIComboBoxEditTextPart,kControlEditTextCFStringTag, 
-           sizeof(CFStringRef),(Ptr) &cfr,NULL));
-    // takes of release responsibility
-    wxMacCFStringHolder cf( cfr ) ;
-    return cf.AsString() ;
+    return wxMacCFStringHolder(m_peer->GetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString();

 #else
     int sel = GetSelection ();
 #else
     int sel = GetSelection ();

-    if (sel > -1)
-        return wxString(this->GetString (sel));
+    if (sel != wxNOT_FOUND)
+        return wxString(this->GetString((unsigned int)sel));

     else
         return wxEmptyString;
 #endif
 }
 
     else
         return wxEmptyString;
 #endif
 }
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
+void wxComboBox::SetString(unsigned int n, const wxString& s)

 {
 {

-    int s = FindString (sel);
-    if (s > -1)
-        {
-            SetSelection (s);
-            return TRUE;
-        }
+#if USE_HICOMBOBOX
+    verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n,
+        wxMacCFStringHolder(s, m_font.GetEncoding()) ) );
+    verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) );
+#else
+    m_choice->SetString( n , s );
+#endif
+}
+
+bool wxComboBox::IsEditable() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return !HasFlag(wxCB_READONLY);
+#else
+    return m_text != NULL && !HasFlag(wxCB_READONLY);
+#endif
+}
+
+void wxComboBox::Undo()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->Undo();
+#endif
+}
+
+void wxComboBox::Redo()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->Redo();
+#endif
+}
+
+void wxComboBox::SelectAll()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->SelectAll();
+#endif
+}
+
+bool wxComboBox::CanCopy() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanCopy();

     else
     else

-        return FALSE;
+        return false;
+#endif

 }
 
 }
 

-void wxComboBox::SetString(int n, const wxString& s) 
+bool wxComboBox::CanCut() const

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    verify_noerr ( HIComboBoxInsertTextItemAtIndex( (HIViewRef) m_macControl, (CFIndex) n, 
-        wxMacCFStringHolder(s, m_font.GetEncoding()) ) );
-    verify_noerr ( HIComboBoxRemoveItemAtIndex( (HIViewRef) m_macControl, (CFIndex) n + 1 ) );
+    // TODO
+    return false;

 #else
 #else

-    m_choice->SetString( n , s ) ;
+    if (m_text != NULL)
+        return m_text->CanCut();
+    else
+        return false;

 #endif
 }
 
 #endif
 }
 

+bool wxComboBox::CanPaste() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanPaste();
+    else
+        return false;
+#endif
+}

 
 

-wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
+bool wxComboBox::CanUndo() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanUndo();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::CanRedo() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanRedo();
+    else
+        return false;
+#endif
+}
+
+wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);

-    return noErr ;
+    return noErr;

 }
 }

-