From 88300af4db7ba9db9f242b777068222331765443 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Mon, 13 Oct 2008 08:39:10 +0000 Subject: [PATCH] remove ugly AD-HOC FIX for wxHyperlinkCtrl; use the generic facilities of RegisterControl() instead (patch by Utensil Candel) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/screenshotgen/src/autocapture.cpp | 4 ---- utils/screenshotgen/src/screenshot_main.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/utils/screenshotgen/src/autocapture.cpp b/utils/screenshotgen/src/autocapture.cpp index 48cadb86ef..3f33fa69cc 100644 --- a/utils/screenshotgen/src/autocapture.cpp +++ b/utils/screenshotgen/src/autocapture.cpp @@ -185,10 +185,6 @@ wxBitmap AutoCaptureMechanism::Capture(Control& ctrl) ctrl.name.StartsWith(_T("wx"), &(ctrl.name)); ctrl.name.MakeLower(); - // AD-HOC FIX for wxHyperlink - if (ctrl.name == "generichyperlinkctrl") - ctrl.name = "hyperlinkctrl"; - // take the screenshot wxBitmap screenshot = Capture(rect); diff --git a/utils/screenshotgen/src/screenshot_main.cpp b/utils/screenshotgen/src/screenshot_main.cpp index bae2ea664f..cebae3daf4 100644 --- a/utils/screenshotgen/src/screenshot_main.cpp +++ b/utils/screenshotgen/src/screenshot_main.cpp @@ -321,7 +321,7 @@ void ScreenshotFrame::OnCaptureAllControls(wxCommandEvent& WXUNUSED(event)) auto_cap.RegisterControl(m_slider1); auto_cap.RegisterControl(m_toggleBtn1, AJ_Union); auto_cap.RegisterControl(m_toggleBtn2, AJ_UnionEnd); - auto_cap.RegisterControl(m_hyperlink1); + auto_cap.RegisterControl(m_hyperlink1, wxT("wxHyperlinkCtrl")); auto_cap.RegisterControl(m_spinCtrl1, AJ_RegionAdjust); auto_cap.RegisterControl(m_spinBtn1); auto_cap.RegisterControl(m_scrollBar1); -- 2.47.2