Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index bc33a141c7b18fe866886872f936ca943da82994..4f98670f68b51bc7dcf45765c44b54f51227cbf6 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement


@@ -29,13 +29,15 @@ class WXDLLEXPORT wxComboBoxBase : public wxItemContainer,
                                    public wxTextEntry
 {
 public:
                                    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();
     }
 
     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
     // also bring in GetSelection() versions of both base classes in scope
     //
     // NB: GetSelection(from, to) could be already implemented in wxTextEntry