X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec080ef1873995bcd9b20b0fc1a6d208a78540d3..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/msw/hyperlink.cpp?ds=sidebyside diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp index 1eb3fb2ca1..cb8951c936 100644 --- a/src/msw/hyperlink.cpp +++ b/src/msw/hyperlink.cpp @@ -24,7 +24,7 @@ #include "wx/hyperlink.h" #ifndef WX_PRECOMP - #include "wx/stattext.h" + #include "wx/app.h" #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/msw/private.h" #include "wx/msw/missing.h" @@ -54,13 +54,19 @@ namespace { bool HasNativeHyperlinkCtrl() { - return wxGetWinVersion() >= wxWinVersion_XP; + // Notice that we really must test comctl32.dll version and not the OS + // version here as even under Vista/7 we could be not using the v6 e.g. + // if the program doesn't have the correct manifest for some reason. + return wxApp::GetComCtl32Version() >= 600; } wxString GetLabelForSysLink(const wxString& text, const wxString& url) { - return wxString("" - + wxStaticText::RemoveMarkup(text) + ""; + // Any "&"s in the text should appear on the screen and not be (mis) + // interpreted as mnemonics. + return wxString::Format("%s", + url, + wxControl::EscapeMnemonics(text)); } } @@ -150,7 +156,7 @@ wxSize wxHyperlinkCtrl::DoGetBestClientSize() const { // LM_GETIDEALSIZE only exists under Vista so use the generic version even // when using the native control under XP - if ( wxGetWinVersion() < wxWinVersion_6 ) + if ( !HasNativeHyperlinkCtrl() || (wxGetWinVersion() < wxWinVersion_6) ) return wxGenericHyperlinkCtrl::DoGetBestClientSize(); SIZE idealSize;