no changes, just remove #if'd out code

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index bc33a141c7b18fe866886872f936ca943da82994..7727d64781bc6d37d96d854f558a462e7a16a065 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 WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 
 // ----------------------------------------------------------------------------
 // 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"
 
 #include "wx/ctrlsub.h"
 #include "wx/textentry.h"
 

-class WXDLLEXPORT wxComboBoxBase : public wxItemContainer,
-                                   public wxTextEntry
+class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
+                                        public wxTextEntry

 {
 public:
 {
 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


@@ -66,7 +68,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/combobox.h"
 #elif defined(__WXPM__)