From c0938d8506409863011956e79b92fc137a5bcccf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 18 Aug 2010 22:48:53 +0000 Subject: [PATCH] Only use native wxHyperlinkCtrl in Unicode build under MSW. The native control is available to Unicode applications only so disable its use in non-Unicode build. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/hyperlink.h | 3 ++- src/msw/hyperlink.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h index 8478ede57b..cecec1ad09 100644 --- a/include/wx/hyperlink.h +++ b/include/wx/hyperlink.h @@ -135,7 +135,8 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&); #if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/hyperlink.h" -#elif defined(__WXMSW__) && !defined(__WXUNIVERSAL__) +// Note that the native control is only available in Unicode version under MSW. +#elif defined(__WXMSW__) && wxUSE_UNICODE && !defined(__WXUNIVERSAL__) #include "wx/msw/hyperlink.h" #else #include "wx/generic/hyperlink.h" diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp index 4e1ec86e7e..a2ba44a8eb 100644 --- a/src/msw/hyperlink.cpp +++ b/src/msw/hyperlink.cpp @@ -19,7 +19,7 @@ #pragma hdrstop #endif -#if wxUSE_HYPERLINKCTRL +#if wxUSE_HYPERLINKCTRL && wxUSE_UNICODE #include "wx/hyperlink.h" @@ -169,4 +169,4 @@ bool wxHyperlinkCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) return wxGenericHyperlinkCtrl::MSWOnNotify(idCtrl, lParam, result); } -#endif // wxUSE_HYPERLINKCTRL +#endif // wxUSE_HYPERLINKCTRL && wxUSE_UNICODE