Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wx prefix for wxUSE_NATIVE_SEARCH_CONTROL macro name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-11 12:57:35 +00:00
parent 675c8837a5
commit 7a71ffc175
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/srchctrl.h
View File

@@ -34,19 +34,17 @@ END_DECLARE_EVENT_TYPES()
// it is based on the MacOSX 10.3 control HISearchFieldCreate // it is based on the MacOSX 10.3 control HISearchFieldCreate
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// include the platform-dependent class implementation // include the platform-dependent class implementation
// ---------------------------------------------------------------------------- #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__ ) && defined( __WXMAC_OSX__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 )
// search control was introduced in Mac OS X 10.3 Panther // search control was introduced in Mac OS X 10.3 Panther
#define USE_NATIVE_SEARCH_CONTROL 1 #define wxUSE_NATIVE_SEARCH_CONTROL 1
#else #else
//not supported on these platforms, leave 0 // no native version, use the generic one
#define USE_NATIVE_SEARCH_CONTROL 0 #define wxUSE_NATIVE_SEARCH_CONTROL 0
#endif #endif
#if USE_NATIVE_SEARCH_CONTROL #if wxUSE_NATIVE_SEARCH_CONTROL
#if defined(__WXMAC__) #if defined(__WXMAC__)
#include "wx/mac/srchctrl.h" #include "wx/mac/srchctrl.h"
#endif #endif
@@ -54,7 +52,10 @@ END_DECLARE_EVENT_TYPES()
#include "wx/generic/srchctlg.h" #include "wx/generic/srchctlg.h"
#endif #endif
// ----------------------------------------------------------------------------
// macros for handling search events // macros for handling search events
// ----------------------------------------------------------------------------
#define EVT_SEARCHCTRL_CANCEL(id, fn) \ #define EVT_SEARCHCTRL_CANCEL(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL, id, wxCommandEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL, id, wxCommandEventHandler(fn))