added template wxScopedArray<> too

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

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 32cc614d958c05f418e4b2fbd32c0c96e5d0c349..d158540b70e112893c093548e0c36aa847d3830f 100644 (file)
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -38,8 +38,8 @@
 
 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
@@ -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"