X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e9ec7239f5395666be46b3edd3a6b889fecfe48..d9bd1a73ff69143ddc205d71e1953e8f26fd573d:/include/wx/generic/combo.h diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h index 8ed30e4e32..703e42fa3a 100644 --- a/include/wx/generic/combo.h +++ b/include/wx/generic/combo.h @@ -26,14 +26,14 @@ // all actions of single line text controls are supported // popup/dismiss the choice window -#define wxACTION_COMBOBOX_POPUP _T("popup") -#define wxACTION_COMBOBOX_DISMISS _T("dismiss") +#define wxACTION_COMBOBOX_POPUP wxT("popup") +#define wxACTION_COMBOBOX_DISMISS wxT("dismiss") #endif -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; -class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase +class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase { public: // ctors and such @@ -101,7 +101,7 @@ private: // If native wxComboCtrl was not defined, then prepare a simple // front-end so that wxRTTI works as expected. -class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl +class WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl { public: wxComboCtrl() : wxGenericComboCtrl() {}