diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index 2a754791f..46cbcfce4 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -5811,14 +5811,15 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
       <not-null/>
     </arg>
-    <arg nr="3" default="false">
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in" default="false">
       <not-uninit/>
     </arg>
-    <arg nr="4" default="NO_IMAGE">
+    <arg nr="4" direction="in" default="NO_IMAGE">
       <not-uninit/>
     </arg>
   </function>
@@ -5827,13 +5828,13 @@
   <function name="wxGrid::SetCellAlignment">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
     <warn severity="style">This function is deprecated. Please use 'wxGrid::SetCellAlignment(row, col, horiz, vert)' instead.</warn>
@@ -5842,22 +5843,22 @@
   <function name="wxGrid::SetCellValue">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3"/>
+    <arg nr="3" direction="in"/>
   </function>
   <!-- void wxGrid::MakeCellVisible(int row, int col)-->
   <function name="wxGrid::MakeCellVisible">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5866,13 +5867,16 @@
   <function name="wxGrid::DrawTextRectangle">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="4" default="wxALIGN_LEFT">
+    <arg nr="1" direction="inout"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in"/>
+    <arg nr="4" direction="in" default="wxALIGN_LEFT">
       <not-uninit/>
     </arg>
-    <arg nr="5" default="wxALIGN_TOP">
+    <arg nr="5" direction="in" default="wxALIGN_TOP">
       <not-uninit/>
     </arg>
-    <arg nr="6" default="wxHORIZONTAL">
+    <arg nr="6" direction="in" default="wxHORIZONTAL">
       <not-uninit/>
     </arg>
   </function>
@@ -5883,10 +5887,10 @@
     <returnValue type="wxString"/>
     <use-retval/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5897,10 +5901,10 @@
     <returnValue type="wxColour"/>
     <use-retval/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5911,10 +5915,10 @@
     <returnValue type="bool"/>
     <use-retval/>
     <const/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5928,13 +5932,16 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <const/>
-    <arg nr="4" default="wxALIGN_LEFT">
+    <arg nr="1" direction="inout"/>
+    <arg nr="2" direction="in"/>
+    <arg nr="3" direction="in"/>
+    <arg nr="4" direction="in" default="wxALIGN_LEFT">
       <not-uninit/>
     </arg>
-    <arg nr="5" default="wxALIGN_TOP">
+    <arg nr="5" direction="in" default="wxALIGN_TOP">
       <not-uninit/>
     </arg>
-    <arg nr="6" default="wxHORIZONTAL">
+    <arg nr="6" direction="in" default="wxHORIZONTAL">
       <not-uninit/>
     </arg>
   </function>
@@ -5943,13 +5950,13 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3" default="wxGridSelectCells">
+    <arg nr="3" direction="in" default="wxGridSelectCells">
       <not-uninit/>
     </arg>
   </function>
@@ -5957,10 +5964,10 @@
   <function name="wxGrid::SetMargins">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -5969,22 +5976,22 @@
   <function name="wxGrid::SetRowLabelValue,wxGrid::SetColLabelValue">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2"/>
+    <arg nr="2" direction="in"/>
   </function>
   <!-- void wxGrid::SetReadOnly(int row, int col, bool isReadOnly = true) -->
   <function name="wxGrid::SetReadOnly">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3" default="true">
+    <arg nr="3" direction="in" default="true">
       <not-uninit/>
     </arg>
   </function>
@@ -5995,25 +6002,25 @@
     <returnValue type="wxGridCellEditor *"/>
     <use-retval/>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
   <!-- http://docs.wxwidgets.org/trunk/classwx_grid.html#adbcbd091140c6adf0f8d04ea1642b24d-->
-  <!-- void wxGrid::SetCellTextColour(wxColour &val, int row, int col) -->
+  <!-- void wxGrid::SetCellTextColour(const wxColour &val, int row, int col) -->
   <function name="wxGrid::SetCellTextColour">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6043,7 +6050,7 @@
     </arg>
     <arg nr="2" default="NULL"/>
     <arg nr="3" default="NULL"/>
-    <arg nr="4" default="SW_SHOWNORMAL">
+    <arg nr="4" direction="in" default="SW_SHOWNORMAL">
       <not-uninit/>
     </arg>
   </function>
@@ -6054,18 +6061,18 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- FILE* wxFopen(const wxString & path, const wxString & mode) -->
   <function name="wxFopen">
     <use-retval/>
     <returnValue type="FILE *"/>
     <noreturn>false</noreturn>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
       <strz/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-null/>
     </arg>
   </function>
@@ -6075,14 +6082,14 @@
   <function name="wxFileName::SetExt,wxFileName::SetFullName,wxFileName::SetName">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- void wxEvent::SetId(int id)-->
   <!-- void wxCommandEvent::SetId(int id)-->
   <function name="wxEvent::SetId,wxCommandEvent::SetId">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6090,7 +6097,7 @@
   <function name="wxStdDialogButtonSizer::AddButton">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-null/>
     </arg>
   </function>
@@ -6098,7 +6105,7 @@
   <function name="wxCheckBox::SetValue">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6106,7 +6113,7 @@
   <function name="wxChoice::SetSelection">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6114,7 +6121,7 @@
   <function name="wxChoice::SetColumns">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" default="1">
+    <arg nr="1" direction="in" default="1">
       <not-uninit/>
     </arg>
   </function>
@@ -6123,7 +6130,7 @@
   <function name="wxTextCtrl::Enable,wxCheckBox::Enable">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" default="true">
+    <arg nr="1" direction="in" default="true">
       <not-uninit/>
     </arg>
   </function>
@@ -6132,17 +6139,17 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1" default="wxID_ANY">
+    <arg nr="1" direction="in" default="wxID_ANY">
       <not-uninit/>
     </arg>
-    <arg nr="2" default="wxEVT_NULL"/>
-    <arg nr="3" default="NULL">
+    <arg nr="2" direction="in" default="wxEVT_NULL"/>
+    <arg nr="3" direction="in" default="NULL">
       <not-uninit/>
     </arg>
-    <arg nr="4" default="NULL">
+    <arg nr="4" direction="inout" default="NULL">
       <not-uninit/>
     </arg>
-    <arg nr="5" default="NULL">
+    <arg nr="5" direction="inout" default="NULL">
       <not-uninit/>
     </arg>
   </function>
@@ -6154,24 +6161,24 @@
   <function name="wxWindow::SetToolTip,wxCheckBox::SetToolTip,wxButton::SetToolTip,wxBitmapButton::SetToolTip,wxTextCtrl::SetToolTip">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- void wxBitmapButton::SetBitmapLabel( const wxBitmap & bitmap ) -->
   <function name="wxBitmapButton::SetBitmapLabel">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="void"/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- void wxFlexGridSizer::AddGrowableCol(size_t idx, int proportion = 0) -->
   <!-- void wxFlexGridSizer::AddGrowableRow(size_t idx, int proportion = 0) -->
   <function name="wxFlexGridSizer::AddGrowableCol,wxFlexGridSizer::AddGrowableRow">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2" default="0">
+    <arg nr="2" direction="in" default="0">
       <not-uninit/>
     </arg>
   </function>
@@ -6185,7 +6192,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="wxSize"/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
       <not-null/>
     </arg>
@@ -6194,19 +6201,19 @@
   <function name="wxFrame::SetMenuBar">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
     </arg>
   </function>
-  <!-- virtual bool wxMenuBar::Append(wxMenu * menu, const wxString & title)	 -->
+  <!-- virtual bool wxMenuBar::Append(wxMenu * menu, const wxString & title) -->
   <function name="wxMenuBar::Append">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="inout">
       <not-uninit/>
     </arg>
-    <arg nr="2"/>
+    <arg nr="2" direction="in"/>
   </function>
   <!-- int wxAtoi(const wxString & str)-->
   <function name="wxAtoi">
@@ -6214,7 +6221,7 @@
     <leak-ignore/>
     <returnValue type="int"/>
     <use-retval/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- double wxAtof(const wxString & str)-->
   <function name="wxAtof">
@@ -6222,7 +6229,7 @@
     <leak-ignore/>
     <returnValue type="double"/>
     <use-retval/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- long wxAtol(const wxString & str)-->
   <function name="wxAtol">
@@ -6230,7 +6237,7 @@
     <leak-ignore/>
     <returnValue type="long"/>
     <use-retval/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- bool wxString::ToDouble(double * val) const -->
   <!-- bool wxString::ToCDouble(double * val) const -->
@@ -6239,7 +6246,7 @@
     <leak-ignore/>
     <const/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-null/>
     </arg>
   </function>
@@ -6248,17 +6255,17 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="wxString &amp;"/>
-    <arg nr="1" default="true">
+    <arg nr="1" direction="in" default="true">
       <not-uninit/>
     </arg>
   </function>
-  <!-- wxString wxString::Strip (stripType s =trailing) const -->
+  <!-- wxString wxString::Strip (stripType s = trailing) const -->
   <function name="wxString::Strip">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <const/>
     <returnValue type="wxString"/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
     <warn severity="style">This is the same as wxString::Trim() except that it doesn't change this string. This is a wxWidgets 1.xx compatibility function; you should not use it in new code.</warn>
   </function>
   <!-- int wxItemContainer::Append(const wxString & item) -->
@@ -6273,7 +6280,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="int"/>
-    <arg nr="any"/>
+    <arg nr="any" direction="in"/>
   </function>
   <!-- virtual void wxBitmap::SetDepth(int depth)  -->
   <!-- virtual void wxBitmap::SetHeight(int height)-->
@@ -6281,7 +6288,7 @@
   <function name="wxBitmap::SetDepth,wxBitmap::SetHeight,wxBitmap::SetWidth">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
     <warn severity="style">This function is deprecated since version 3.1.2, dimensions and depth can only be set at construction time.</warn>
@@ -6297,10 +6304,10 @@
     <leak-ignore/>
     <const/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="out">
       <not-null/>
     </arg>
-    <arg nr="2" default="10">
+    <arg nr="2" direction="in" default="10">
       <not-uninit/>
       <valid>0,2:36</valid>
     </arg>
@@ -6310,19 +6317,19 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="3">
+    <arg nr="3" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="4">
+    <arg nr="4" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="5" default="wxMOUSE_BTN_LEFT">
+    <arg nr="5" direction="in" default="wxMOUSE_BTN_LEFT">
       <not-uninit/>
     </arg>
   </function>
@@ -6331,10 +6338,10 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2">
+    <arg nr="2" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6345,10 +6352,10 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2" default="wxMOD_NONE">
+    <arg nr="2" direction="in" default="wxMOD_NONE">
       <not-uninit/>
     </arg>
   </function>
@@ -6357,7 +6364,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
@@ -6368,7 +6375,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1" default="wxMOUSE_BTN_LEFT">
+    <arg nr="1" direction="in" default="wxMOUSE_BTN_LEFT">
       <not-uninit/>
     </arg>
   </function>
@@ -6377,7 +6384,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1" default="wxMOUSE_BTN_DOWN">
+    <arg nr="1" direction="in" default="wxMOUSE_BTN_DOWN">
       <not-uninit/>
     </arg>
   </function>
@@ -6387,7 +6394,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1"/>
+    <arg nr="1" direction="in"/>
   </function>
   <!-- bool wxPGProperty::SetValueFromInt(long value, int flags = 0) -->
   <!-- bool wxBoolProperty::SetValueFromInt(long value, int flags = 0) -->
@@ -6395,10 +6402,10 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="bool"/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
-    <arg nr="2" default="0">
+    <arg nr="2" direction="in" default="0">
       <not-uninit/>
     </arg>
   </function>
@@ -6407,7 +6414,7 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
     <returnValue type="void"/>
-    <arg nr="2" default="0">
+    <arg nr="2" direction="in" default="0">
       <not-uninit/>
     </arg>
     <arg nr="2" default="wxPG_SETVAL_REFRESH_EDITOR">
@@ -6418,7 +6425,7 @@
   <function name="wxPGProperty::SetExpanded">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1">
+    <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
   </function>
diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
index a50093929..763cc5133 100644
--- a/test/cfg/wxwidgets.cpp
+++ b/test/cfg/wxwidgets.cpp
@@ -60,20 +60,23 @@ void nullPointer(const wxString &str)
     double *doublePtr = NULL;
     // cppcheck-suppress nullPointer
     (void)str.ToDouble(doublePtr);
+    double *doublePtr1 = NULL;
     // cppcheck-suppress nullPointer
-    (void)str.ToCDouble(doublePtr);
+    (void)str.ToCDouble(doublePtr1);
 
     long * longPtr = NULL;
     // cppcheck-suppress nullPointer
     (void)str.ToLong(longPtr);
+    long * longPtr1 = NULL;
     // cppcheck-suppress nullPointer
-    (void)str.ToCLong(longPtr);
+    (void)str.ToCLong(longPtr1);
 
     unsigned long * ulongPtr = NULL;
     // cppcheck-suppress nullPointer
     (void)str.ToULong(ulongPtr);
+    unsigned long * ulongPtr1 = NULL;
     // cppcheck-suppress nullPointer
-    (void)str.ToCULong(ulongPtr);
+    (void)str.ToCULong(ulongPtr1);
 
     long long * longLongPtr = NULL;
     // cppcheck-suppress nullPointer