Fix syntaxErrors with wxGrid, tinyxml2::XMLError enums (danmar#6304)

chrchr-github · Apr 18, 2024 · 8c78869 · 8c78869
1 parent 5c97641
commit 8c78869
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/cfg/tinyxml2.cfg b/cfg/tinyxml2.cfg
@@ -1,24 +1,5 @@
 <?xml version="1.0"?>
 <def format="2">
-  <define name="XML_SUCCESS" value="0"/>
-  <define name="XML_NO_ATTRIBUTE" value="1"/>
-  <define name="XML_WRONG_ATTRIBUTE_TYPE" value="2"/>
-  <define name="XML_ERROR_FILE_NOT_FOUND" value="3"/>
-  <define name="XML_ERROR_FILE_COULD_NOT_BE_OPENED" value="4"/>
-  <define name="XML_ERROR_FILE_READ_ERROR" value="5"/>
-  <define name="XML_ERROR_PARSING_ELEMENT" value="6"/>
-  <define name="XML_ERROR_PARSING_ATTRIBUTE" value="7"/>
-  <define name="XML_ERROR_PARSING_TEXT" value="8"/>
-  <define name="XML_ERROR_PARSING_COMMENT" value="9"/>
-  <define name="XML_ERROR_PARSING_DECLARATION" value="10"/>
-  <define name="XML_ERROR_PARSING_UNKNOWN" value="11"/>
-  <define name="XML_ERROR_EMPTY_DOCUMENT" value="12"/>
-  <define name="XML_ERROR_MISMATCHED_ELEMENT" value="13"/>
-  <define name="XML_ERROR_PARSING" value="14"/>
-  <define name="XML_CAN_NOT_CONVERT_TEXT" value="15"/>
-  <define name="XML_NO_TEXT_NODE" value="16"/>
-  <define name="XML_ELEMENT_DEPTH_EXCEEDED" value="17"/>
-  <define name="XML_ERROR_COUNT" value="18"/>
   <!-- tinyxml2::XMLError tinyxml2::XMLDocument::LoadFile( const char* filename ) -->
   <!-- tinyxml2::XMLError tinyxml2::XMLDocument::LoadFile( FILE* ) -->
   <function name="tinyxml2::XMLDocument::LoadFile">

diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
@@ -884,10 +884,6 @@
   <define name="wxFLP_FILE_MUST_EXIST" value="0x2000"/>
   <define name="wxFLP_CHANGE_DIR" value="0x4000"/>
   <define name="wxFLP_SMALL" value="0x8000"/>
-  <define name="wxGridSelectCells" value="0"/>
-  <define name="wxGridSelectRows" value="1"/>
-  <define name="wxGridSelectColumns" value="2"/>
-  <define name="wxGridSelectRowsOrColumns" value="3"/>
   <define name="wxANTIALIAS_NONE" value="0"/>
   <define name="wxANTIALIAS_DEFAULT" value="1"/>
   <define name="wxINTERPOLATION_DEFAULT" value="0"/>

diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
@@ -39,6 +39,7 @@
 #include <wx/gdicmn.h>
 #include <wx/geometry.h>
 #include <wx/graphics.h>
+#include <wx/grid.h>
 #include <wx/icon.h>
 #include <wx/iconbndl.h>
 #include <wx/iconloc.h>
@@ -1280,3 +1281,9 @@ wxString::iterator wxString_test3()
     // cppcheck-suppress returnDanglingLifetime
     return it;
 }
+
+wxGrid::wxGridSelectionModes get_wxGridSelectionModes()
+{
+    // cppcheck-suppress valueFlowBailoutIncompleteVar // TODO: configure enum #8183
+    return wxGrid::wxGridSelectCells;
+}