X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c29c95fe24973b94fd724db767193171ca7c513d..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/osx/combobox.h

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 4a31de9135..e3c14f8ad0 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -26,12 +26,13 @@ class wxComboWidgetImpl;
 
 // Combobox item
 class WXDLLIMPEXP_CORE wxComboBox :
+    public wxWindowWithItems<
 #if wxOSX_USE_CARBON
-    public wxNavigationEnabled<wxControl>,
+                wxNavigationEnabled<wxControl>,
 #else
-    public wxControl,
+                wxControl,
 #endif
-    public wxComboBoxBase
+                wxComboBoxBase>
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 
@@ -103,10 +104,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
 
     virtual unsigned int GetCount() const;
 
+    virtual void SetValue(const wxString& value);
 // these methods are provided by wxTextEntry for the native impl.
 #if wxOSX_USE_CARBON
     // Text field functions
-    virtual void SetValue(const wxString& value);
     virtual wxString GetValue() const;
     virtual void WriteText(const wxString& text);
 
@@ -138,14 +139,16 @@ class WXDLLIMPEXP_CORE wxComboBox :
     virtual wxTextWidgetImpl* GetTextPeer() const;
 #endif // wxOSX_USE_CARBON
 
+#if wxOSX_USE_COCOA
+    virtual void Popup();
+    virtual void Dismiss();
+#endif // wxOSX_USE_COCOA
 
 
     // osx specific event handling common for all osx-ports
 
     virtual bool        OSXHandleClicked( double timestampsec );
 
-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-
 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;
 #endif