cleanup mac

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 5c728117c5239aceebecdbea3466af9697e522dd..dddce8211e6a4d0140c138384bc6f00a5129bfe8 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/textctrl.h"
 #endif
 
 #include "wx/mac/uma.h"
@@ -344,8 +345,13 @@ bool wxComboBox::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name)
 {
-    return Create( parent, id, value, pos, size, 0, NULL,
-                   style, validator, name );
+    if ( !Create( parent, id, value, pos, size, 0, NULL,
+                   style, validator, name ) )
+        return false;
+
+    Append(choices);
+
+    return true;
 }
 
 bool wxComboBox::Create(wxWindow *parent,
@@ -417,6 +423,16 @@ void wxComboBox::SetValue(const wxString& 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()