X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7dfb0b59fab3266e1268c76cc22107ce07fad29..5acb9127c51a79e792f6faeea6c70f32e622ee17:/include/wx/combobox.h?ds=sidebyside diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 4f98670f68..58d5344e22 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -16,7 +16,7 @@ #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 @@ -25,7 +25,7 @@ extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; #include "wx/ctrlsub.h" #include "wx/textentry.h" -class WXDLLEXPORT wxComboBoxBase : public wxItemContainer, +class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer, public wxTextEntry { public: @@ -68,7 +68,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__)