projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing exports
[wxWidgets.git]
/
include
/
wx
/
srchctrl.h
diff --git
a/include/wx/srchctrl.h
b/include/wx/srchctrl.h
index 5ec9336f3f13cbfb554320431c5d643c5a2a2bbf..e57078cc7f66ecd2211293aefc902bb455e9d4f8 100644
(file)
--- a/
include/wx/srchctrl.h
+++ b/
include/wx/srchctrl.h
@@
-17,8
+17,7
@@
#include "wx/textctrl.h"
#include "wx/textctrl.h"
-#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) && defined(__WXMAC_OSX__) \
- && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__)
// search control was introduced in Mac OS X 10.3 Panther
#define wxUSE_NATIVE_SEARCH_CONTROL 1
// search control was introduced in Mac OS X 10.3 Panther
#define wxUSE_NATIVE_SEARCH_CONTROL 1
@@
-27,14
+26,17
@@
// no native version, use the generic one
#define wxUSE_NATIVE_SEARCH_CONTROL 0
// no native version, use the generic one
#define wxUSE_NATIVE_SEARCH_CONTROL 0
- #define wxSearchCtrlBaseBaseClass wxTextCtrlBase
+ class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass : public wxControl,
+ public wxTextCtrlIface
+ {
+ };
#endif
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-extern WXDLLEXPORT_DATA(const
wxC
har) wxSearchCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const
c
har) wxSearchCtrlNameStr[];
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
@@
-52,9
+54,11
@@
public:
wxSearchCtrlBase() { }
virtual ~wxSearchCtrlBase() { }
wxSearchCtrlBase() { }
virtual ~wxSearchCtrlBase() { }
- // search control
+ // search control
+#if wxUSE_MENUS
virtual void SetMenu(wxMenu *menu) = 0;
virtual wxMenu *GetMenu() = 0;
virtual void SetMenu(wxMenu *menu) = 0;
virtual wxMenu *GetMenu() = 0;
+#endif // wxUSE_MENUS
// get/set options
virtual void ShowSearchButton( bool show ) = 0;
// get/set options
virtual void ShowSearchButton( bool show ) = 0;