Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / osx / combobox.h

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 8d875edd34f399dce47435d77a19d23c9c9d6b23..d7d16f503f61a45fde4328ed3ec805e9af398d09 100644 (file)
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,12 +25,13 @@ class wxComboWidgetImpl;
 
 // Combobox item
 class WXDLLIMPEXP_CORE wxComboBox :
 
 // Combobox item
 class WXDLLIMPEXP_CORE wxComboBox :

+    public wxWindowWithItems<

 #if wxOSX_USE_CARBON
 #if wxOSX_USE_CARBON

-    public wxNavigationEnabled<wxControl>,
+                wxNavigationEnabled<wxControl>,

 #else
 #else

-    public wxControl,
+                wxControl,

 #endif
 #endif

-    public wxComboBoxBase
+                wxComboBoxBase>

 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
 


@@ -103,10 +103,10 @@ class WXDLLIMPEXP_CORE wxComboBox :
 
     virtual unsigned int GetCount() const;
 
 
     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
 // 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);
 
     virtual wxString GetValue() const;
     virtual void WriteText(const wxString& text);
 


@@ -138,16 +138,16 @@ class WXDLLIMPEXP_CORE wxComboBox :
     virtual wxTextWidgetImpl* GetTextPeer() const;
 #endif // wxOSX_USE_CARBON
 
     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 );
 
 
 
     // osx specific event handling common for all osx-ports
 
     virtual bool        OSXHandleClicked( double timestampsec );
 

-#if wxOSX_USE_CARBON
-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-#endif
-

 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;
 #endif
 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;
 #endif