head 1.1; access; symbols pkgsrc-2026Q1:1.1.0.32 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.30 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.28 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.26 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.24 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.22 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.20 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.18 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.16 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.14 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.12 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.10 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.8 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.6 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.4 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.2 pkgsrc-2022Q2-base:1.1; locks; strict; comment @// @; 1.1 date 2022.04.04.21.14.51; author bouyer; state Exp; branches; next ; commitid 3n40eqpDzaVEyVyD; desc @@ 1.1 log @Fix icon handling, especially for toolbar. Bump PKGREVISION @ text @$NetBSD: $ Fix icons handling --- src/icons.cpp.orig 2022-04-04 11:24:07.480802638 +0200 +++ src/icons.cpp 2022-04-04 11:24:57.651441818 +0200 @@@@ -29,31 +29,18 @@@@ _img_plots = new wxBitmap(wxImage(sm)); } -// wxFileName fn; -// fn.SetPath(*GetpSharedDataLocation()); -// fn.AppendDir(_T("plugins")); -// fn.AppendDir(_T("plots_pi")); -// fn.AppendDir(_T("data")); -// fn.SetFullName(_T("plots_pi.svg")); -// _svg_plots = fn.GetFullPath(); -// fn.SetFullName(_T("plots_pi_rollover.svg")); -// _svg_plots_rollover = fn.GetFullPath(); -// fn.SetFullName(_T("plots_pi_toggled.svg")); -// _svg_plots_toggled = fn.GetFullPath(); - #ifdef PLUGIN_USE_SVG - wxFileName fn; - fn.SetPath(GetPluginDataDir("plots_pi")); - fn.AppendDir(_T("data")); - fn.SetFullName(_T("plots_pi.svg")); - _svg_plots = fn.GetFullPath(); - wxLogMessage(_T("Loading toolbar icon: ") + _svg_plots); - fn.SetFullName(_T("plots_pi_rollover.svg")); - _svg_plots_rollover = fn.GetFullPath(); - wxLogMessage(_T("Loading toolbar icon: ") + _svg_plots_rollover); - fn.SetFullName(_T("plots_pi_toggled.svg")); - _svg_plots_toggled = fn.GetFullPath(); - wxLogMessage(_T("Loading toolbar icon: ") + _svg_plots_toggled); + wxFileName fn; + fn.SetPath(*GetpSharedDataLocation()); + fn.AppendDir(_T("plugins")); + fn.AppendDir(_T("plots_pi")); + fn.AppendDir(_T("data")); + fn.SetFullName(_T("plots_pi.svg")); + _svg_plots = fn.GetFullPath(); + fn.SetFullName(_T("plots_pi.svg")); + _svg_plots_rollover = fn.GetFullPath(); + fn.SetFullName(_T("plots_pi_toggled.svg")); + _svg_plots_toggled = fn.GetFullPath(); #endif return; @