Added missing URL attribute testing

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 1241f98b12cbd7e31e274a4b87e70a365a2b815e..63c256d52d4066d1fbb2e5cec5b173ab39945bcb 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -20,6 +20,7 @@
     #include "wx/menu.h"
     #include "wx/containr.h"
     #include "wx/toplevel.h"
     #include "wx/menu.h"
     #include "wx/containr.h"
     #include "wx/toplevel.h"

+    #include "wx/textctrl.h"

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


@@ -417,6 +418,16 @@ void wxComboBox::SetValue(const wxString& value)
         m_text->SetValue( value );
 }
 
         m_text->SetValue( value );
 }
 

+void wxComboBox::WriteText(const wxString& text)
+{
+    m_text->WriteText(text);
+}
+
+void wxComboBox::GetSelection(long *from, long *to) const
+{
+    m_text->GetSelection(from, to);
+}
+

 // Clipboard operations
 
 void wxComboBox::Copy()
 // Clipboard operations
 
 void wxComboBox::Copy()


@@ -507,44 +518,37 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
                               void **clientData,
                               wxClientDataType type)
 {
                               void **clientData,
                               wxClientDataType type)
 {

-    // wxItemContainer should probably be doing it itself but usually this is
-    // not necessary as the derived class DoInsertItems() calls
-    // AssignNewItemClientData() which initializes m_clientDataItemsType
-    // correctly; however as we just forward everything to wxChoice, we need to
-    // do it ourselves
-    //
-    // also notice that we never use wxClientData_Object with wxChoice as we
-    // don't want it to delete the data -- we will
-    int rc = m_choice->DoInsertItems(items, pos, clientData,
-                                     clientData ? wxClientData_Void
-                                                : wxClientData_None) ;
-    if ( rc != wxNOT_FOUND )
-    {
-        if ( !HasClientData() && type != wxClientData_None )
-            m_clientDataItemsType = type;
-    }
-
-    return rc;
+    return m_choice->DoInsertItems(items, pos, clientData, type);

 }
 
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
 }
 
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {

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

 }
 
 void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {
 }
 
 void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {

-    return m_choice->GetClientData( n ) ;
+    return m_choice->DoGetItemClientData( n ) ;
+}
+
+wxClientDataType wxComboBox::GetClientDataType() const
+{
+    return m_choice->GetClientDataType();
+}
+
+void wxComboBox::SetClientDataType(wxClientDataType clientDataItemsType)
+{
+    m_choice->SetClientDataType(clientDataItemsType);

 }
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {
 }
 
 void wxComboBox::DoDeleteOneItem(unsigned int n)
 {

-    m_choice->Delete( n );
+    m_choice->DoDeleteOneItem( n );

 }
 
 void wxComboBox::DoClear()
 {
 }
 
 void wxComboBox::DoClear()
 {

-    m_choice->Clear();
+    m_choice->DoClear();

 }
 
 int wxComboBox::GetSelection() const
 }
 
 int wxComboBox::GetSelection() const