corrected an superfluous initfloatingwindows call in carbon

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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 2b1cf2daaef2948c9d6f649334eae8358b6824b3..6c8444fc8af4cd7851530de623ecbd8ab92601ef 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -15,6 +15,7 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/choice.h"
+#include "wx/menu.h"
 #include "wx/mac/uma.h"
 
 #if !USE_SHARED_LIBRARY
@@ -32,8 +33,8 @@ wxChoice::~wxChoice()
 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)
 {
@@ -75,6 +76,15 @@ void wxChoice::Append(const wxString& item)
        SetControlMaximum( m_macControl , Number()) ;
 }
 
+void wxChoice::Append(const wxString &item, void *client_data)
+{
+}
+
+void *wxChoice::GetClientData(int index) const
+{
+   return NULL;
+}
+
 void wxChoice::Delete(int n)
 {
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;