From 9ec6078f4197e4b3d09cc30e97b3f2d2fab01d74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 25 Jun 2007 12:16:20 +0000 Subject: [PATCH] fixed 'url' field extraction to be done for wxHtmlWindow only (bug #1741900) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxrc/wxrc.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index c07224810e..9d740b4947 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -441,10 +441,6 @@ static bool NodeContainsFilename(wxXmlNode *node) if ( name == _T("icon") ) return true; - // URLs in wxHtmlWindow: - if ( name == _T("url") ) - return true; - // wxBitmapButton: wxXmlNode *parent = node->GetParent(); if (parent != NULL && @@ -464,6 +460,15 @@ static bool NodeContainsFilename(wxXmlNode *node) return true; } + // URLs in wxHtmlWindow: + if ( name == _T("url") && + parent != NULL && + parent->GetPropVal(_T("class"), _T("")) == _T("wxHtmlWindow") ) + { + // FIXME: this is wrong for e.g. http:// URLs + return true; + } + return false; } -- 2.50.0