X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..dc813e6c7ef8a9a26c035b004b512e1aa1b0bf3f:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index 69cab9702e..18d31d2c12 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -26,13 +26,13 @@ // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxChoiceNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[]; // ---------------------------------------------------------------------------- // wxChoice allows to select one of a non-modifiable list of strings // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoiceBase : public wxControlWithItems +class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems { public: wxChoiceBase() { } @@ -79,11 +79,13 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/choice.h" #elif defined(__WXMAC__) - #include "wx/mac/choice.h" + #include "wx/osx/choice.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/choice.h" #elif defined(__WXPM__) #include "wx/os2/choice.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/choice.h" #endif #endif // wxUSE_CHOICE