Avoid id clashes

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index bc33a141c7b18fe866886872f936ca943da82994..a0245f9e23f506d2a6e1e85292cb27ce088734a3 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_COMBOBOX
 
-extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
@@ -25,17 +25,19 @@ extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 #include "wx/ctrlsub.h"
 #include "wx/textentry.h"
 
-class WXDLLEXPORT wxComboBoxBase : public wxItemContainer,
-                                   public wxTextEntry
+class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
+                                        public wxTextEntry
 {
 public:
-    // override this to disambiguate between two base classes versions
+    // override these methods to disambiguate between two base classes versions
     virtual void Clear()
     {
         wxTextEntry::Clear();
         wxItemContainer::Clear();
     }
 
+    bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+
     // also bring in GetSelection() versions of both base classes in scope
     //
     // NB: GetSelection(from, to) could be already implemented in wxTextEntry
@@ -45,6 +47,9 @@ public:
     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
@@ -66,7 +71,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/combobox.h"
+    #include "wx/osx/combobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/combobox.h"
 #elif defined(__WXPM__)