diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index e3ccb11fb..0bccc8179 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -10738,9 +10738,16 @@
     </arg>
   </function>
   <!-- virtual void wxWithImages::SetImageList(wxImageList * imageList) -->
+  <!-- virtual void wxWithImages::AssignImageList(wxImageList * imageList) -->
   <!-- virtual void wxToolbook::SetImageList(wxImageList * imageList) -->
+  <!-- virtual void wxToolbook::AssignImageList(wxImageList * imageList) -->
   <!-- virtual void wxTreeListCtrl::SetImageList(wxImageList * imageList) -->
-  <function name="wxWithImages::SetImageList,wxToolbook::SetImageList,wxTreeListCtrl::SetImageList">
+  <!-- virtual void wxTreeListCtrl::AssignImageList(wxImageList * imageList) -->
+  <!-- virtual void wxNotebook::SetImageList(wxImageList * imageList) -->
+  <!-- virtual void wxNotebook::AssignImageList(wxImageList * imageList) -->
+  <!-- virtual void wxDataViewTreeCtrl::SetImageList(wxImageList * imageList) -->
+  <!-- virtual void wxDataViewTreeCtrl::AssignImageList(wxImageList * imageList) -->
+  <function name="wxWithImages::SetImageList,wxWithImages::AssignImageList,wxDataViewTreeCtrl::SetImageList,wxDataViewTreeCtrl::AssignImageList,wxToolbook::SetImageList,wxToolbook::AssignImageList,wxTreeListCtrl::AssignImageList,wxNotebook::AssignImageList,wxTreeListCtrl::SetImageList,wxNotebook::SetImageList">
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="void"/>
@@ -11307,6 +11314,14 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- bool wxGenericProgressDialog::WasCancelled() const -->
+  <function name="wxGenericProgressDialog::WasCancelled">
+    <const/>
+    <leak-ignore/>
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <returnValue type="bool"/>
+  </function>
   <!-- void wxGrid::SetRowLabelSize( int width ) -->
   <function name="wxGrid::SetRowLabelSize">
     <leak-ignore/>
@@ -11807,17 +11822,6 @@
     </arg>
     <arg nr="2" direction="out"/>
   </function>
-  <!-- void wxTreeListCtrl::AssignImageList(wxImageList * imageList) -->
-  <!-- void wxDataViewTreeCtrl::AssignImageList(wxImageList * imageList) -->
-  <function name="wxTreeListCtrl::AssignImageList,wxDataViewTreeCtrl::AssignImageList">
-    <leak-ignore/>
-    <noreturn>false</noreturn>
-    <returnValue type="void"/>
-    <arg nr="1" direction="inout">
-      <not-uninit/>
-      <not-null/>
-    </arg>
-  </function>
   <!-- wxDataViewItem wxDataViewTreeCtrl::AppendContainer(const wxDataViewItem & parent, const wxString & text, int icon = -1, int expanded = -1, wxClientData * data = NULL) -->
   <function name="wxDataViewTreeCtrl::AppendContainer">
     <leak-ignore/>
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 2f89a4dd5..e68d62eb8 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -3777,7 +3777,7 @@ AccessControl Scope::defaultAccess() const
 }
 
 void Scope::addVariable(const Token *token_, const Token *start_, const Token *end_,
-    AccessControl access_, const Type *type_, const Scope *scope_, const Settings* settings)
+                        AccessControl access_, const Type *type_, const Scope *scope_, const Settings* settings)
 {
     // keep possible size_t -> int truncation outside emplace_back() to have a single line
     // C4267 VC++ warning instead of several dozens lines