Correct spelling, now use Indices

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 4f98670f68b51bc7dcf45765c44b54f51227cbf6..58d5344e22ad9d3fab8e1345858b7c46c39c90ab 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 char) 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,7 +25,7 @@ extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[];
 #include "wx/ctrlsub.h"
 #include "wx/textentry.h"
 
 #include "wx/ctrlsub.h"
 #include "wx/textentry.h"
 

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

                                    public wxTextEntry
 {
 public:
                                    public wxTextEntry
 {
 public:


@@ -68,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__)