From 5644f46b7296287448cecb52a139fa1bd9ff3094 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Wed, 10 Apr 2024 20:55:14 +0200 Subject: [PATCH 1/2] wxwidgets.cfg: Added support for more interfaces --- cfg/wxwidgets.cfg | 4 ++++ test/cfg/wxwidgets.cpp | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg index 006c8f7f297..120c2ad8acb 100644 --- a/cfg/wxwidgets.cfg +++ b/cfg/wxwidgets.cfg @@ -4,6 +4,7 @@ wxAcceleratorEntry wxAny + wxArchiveIterator wxArrayDouble wxArrayInt wxArrayPtrVoid @@ -90,6 +91,8 @@ wxStdDialogButtonSizer wxSystemOptions wxSystemSettings + wxTarEntry + wxTarInputStream wxTimeSpan wxUString wxVariant @@ -100,6 +103,7 @@ wxVector wxVersionInfo wxWrapSizer + wxZipInputStream diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp index f2d92a61d9e..fdbe81a8168 100644 --- a/test/cfg/wxwidgets.cpp +++ b/test/cfg/wxwidgets.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #if wxCHECK_VERSION(3, 1, 6) // wxWidets-3.1.6 or higher @@ -67,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -74,6 +76,7 @@ #include #include #include +#include #if wxCHECK_VERSION(3, 1, 6) // wxWidets-3.1.6 or higher void unreadVariable_wxBitmapBundle(const wxBitmap &bmp, const wxIcon &icon, const wxImage &image, const char *const * xpm, const wxBitmapBundle &bundle) @@ -109,6 +112,24 @@ void unreadVariable_wxDCTextBgColourChanger(wxDC &dc, const wxColour &colour) } #endif +void unreadVariable_wxArchiveIterator() +{ + // cppcheck-suppress unreadVariable + wxArchiveIterator a; +} + +void unreadVariable_wxZipEntry(const wxZipEntry &entry) +{ + // cppcheck-suppress unreadVariable + wxZipEntry a(entry); +} + +void unreadVariable_wxTarEntry(const wxTarEntry &entry) +{ + // cppcheck-suppress unreadVariable + wxTarEntry a(entry); +} + void unreadVariable_wxDCTextColourChanger(wxDC &dc, const wxColour &colour) { // cppcheck-suppress unreadVariable From ba4f158d80cecaa69817943bdd45e2680ec97928 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Wed, 10 Apr 2024 21:07:54 +0200 Subject: [PATCH 2/2] Fix --- cfg/wxwidgets.cfg | 1 + test/cfg/wxwidgets.cpp | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg index 120c2ad8acb..2c451c97243 100644 --- a/cfg/wxwidgets.cfg +++ b/cfg/wxwidgets.cfg @@ -103,6 +103,7 @@ wxVector wxVersionInfo wxWrapSizer + wxZipEntry wxZipInputStream diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp index fdbe81a8168..e7de6c1b0f5 100644 --- a/test/cfg/wxwidgets.cpp +++ b/test/cfg/wxwidgets.cpp @@ -112,12 +112,6 @@ void unreadVariable_wxDCTextBgColourChanger(wxDC &dc, const wxColour &colour) } #endif -void unreadVariable_wxArchiveIterator() -{ - // cppcheck-suppress unreadVariable - wxArchiveIterator a; -} - void unreadVariable_wxZipEntry(const wxZipEntry &entry) { // cppcheck-suppress unreadVariable