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

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 8478ede57ba97723fc8a37b1deb9eca6f5195cfa..cecec1ad094280f74528d7a1d9b6952210d615d4 100644 (file)
--- 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 4e1ec86e7e1845d151460f0d51fdfc07efbc3702..a2ba44a8eb2747b8de6ed4152b922ada84f608f7 100644 (file)
--- 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