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

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index e5ffb31efc7db2d0100dbf58408866ab238145a4..93b3699553998e4f5fe70e5349d3d318d591ef93 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -1,15 +1,92 @@
-#ifndef __COMBOBOXH_BASE__
-#define __COMBOBOXH_BASE__
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/combobox.h
+// Purpose:     wxComboBox declaration
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     24.12.00
+// Copyright:   (c) 1996-2000 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__WXMSW__)
-#include "wx/msw/combobox.h"
+#ifndef _WX_COMBOBOX_H_BASE_
+#define _WX_COMBOBOX_H_BASE_
+
+#include "wx/defs.h"
+
+#if wxUSE_COMBOBOX
+
+// For compatibility with 2.8 include this header to allow using wxTE_XXX
+// styles with wxComboBox without explicitly including it in the user code.
+#include "wx/textctrl.h"
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
+
+// ----------------------------------------------------------------------------
+// wxComboBoxBase: this interface defines the methods wxComboBox must implement
+// ----------------------------------------------------------------------------
+
+#include "wx/ctrlsub.h"
+#include "wx/textentry.h"
+
+class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
+                                        public wxTextEntry
+{
+public:
+    // override these methods to disambiguate between two base classes versions
+    virtual void Clear()
+    {
+        wxTextEntry::Clear();
+        wxItemContainer::Clear();
+    }
+
+    // IsEmpty() is ambiguous because we inherit it from both wxItemContainer
+    // and wxTextEntry, and even if defined it here to help the compiler with
+    // choosing one of them, it would still be confusing for the human users of
+    // this class. So instead define the clearly named methods below and leave
+    // IsEmpty() ambiguous to trigger a compilation error if it's used.
+    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+
+    // also bring in GetSelection() versions of both base classes in scope
+    //
+    // NB: GetSelection(from, to) could be already implemented in wxTextEntry
+    //     but still make it pure virtual because for some platforms it's not
+    //     implemented there and also because the derived class has to override
+    //     it anyhow to avoid ambiguity with the other GetSelection()
+    virtual int GetSelection() const = 0;
+    virtual void GetSelection(long *from, long *to) const = 0;
+
+    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
+    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
+
+    // may return value different from GetSelection() when the combobox
+    // dropdown is shown and the user selected, but not yet accepted, a value
+    // different from the old one in it
+    virtual int GetCurrentSelection() const { return GetSelection(); }
+};
+
+// ----------------------------------------------------------------------------
+// include the platform-dependent header defining the real class
+// ----------------------------------------------------------------------------
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/combobox.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/combobox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/combobox.h"
+    #include "wx/motif/combobox.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/combobox.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/combobox.h"
-#elif defined(__WXQT__)
-#include "wx/qt/combobox.h"
+    #include "wx/gtk1/combobox.h"
+#elif defined(__WXMAC__)
+    #include "wx/osx/combobox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/combobox.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/combobox.h"
 #endif
 
-#endif
-    // __COMBOBOXH_BASE__
+#endif // wxUSE_COMBOBOX
+
+#endif // _WX_COMBOBOX_H_BASE_