X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c058cafa56179e79df02ad370bdeafd725ff2478..96defed03c190cb602ed4f7ca6e962a49e10dddd:/include/wx/srchctrl.h diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h index a3d1c2aa22..ccd27a29be 100644 --- a/include/wx/srchctrl.h +++ b/include/wx/srchctrl.h @@ -36,17 +36,17 @@ // constants // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) wxSearchCtrlNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxSearchCtrlNameStr[]; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN; +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, wxCommandEvent); +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, wxCommandEvent); // ---------------------------------------------------------------------------- // a search ctrl is a text control with a search button and a cancel button // it is based on the MacOSX 10.3 control HISearchFieldCreate // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass +class WXDLLIMPEXP_CORE wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass { public: wxSearchCtrlBase() { } @@ -70,7 +70,7 @@ public: // include the platform-dependent class implementation #if wxUSE_NATIVE_SEARCH_CONTROL #if defined(__WXMAC__) - #include "wx/mac/srchctrl.h" + #include "wx/osx/srchctrl.h" #endif #else #include "wx/generic/srchctlg.h"