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

Only use native wxHyperlinkCtrl in Unicode build under MSW.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-08-18 22:48:53 +00:00
parent 8220f2f145
commit c0938d8506
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/hyperlink.h
View File

@@ -135,7 +135,8 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
#if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__) #if defined(__WXGTK210__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk/hyperlink.h" #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" #include "wx/msw/hyperlink.h"
#else #else
#include "wx/generic/hyperlink.h" #include "wx/generic/hyperlink.h"

4
src/msw/hyperlink.cpp
View File

@@ -19,7 +19,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_HYPERLINKCTRL #if wxUSE_HYPERLINKCTRL && wxUSE_UNICODE
#include "wx/hyperlink.h" #include "wx/hyperlink.h"
@@ -169,4 +169,4 @@ bool wxHyperlinkCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
return wxGenericHyperlinkCtrl::MSWOnNotify(idCtrl, lParam, result); return wxGenericHyperlinkCtrl::MSWOnNotify(idCtrl, lParam, result);
} }
#endif // wxUSE_HYPERLINKCTRL #endif // wxUSE_HYPERLINKCTRL && wxUSE_UNICODE