diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index dcaaffe78..7fbb4fd32 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -17,7 +17,7 @@
   <define name="wxTRANSLATE(str)" value="str"/>
   <!-- http://docs.wxwidgets.org/trunk/group__group__funcmacro__string.html#ga8a02b8875a521df57263a9e6f090f2d0 -->
   <!-- const wxString& _(const wxString & string) // Macro that expands to wxGetTranslation -->
-  <define name="_(str)" value="str"/>
+  <define name="_(str)" value="wxGetTranslation(str)"/>
   <define name="wxLongLong_t" value="int64_t"/>
   <define name="wxExit" value="exit"/>
   <!-- wxVector<T> is a template class which implements most of the std::vector functions -->
@@ -372,8 +372,8 @@
   <define name="EVT_COMMAND_SCROLL_PAGEUP(id,func)" value=""/>
   <define name="EVT_COMMAND_SCROLL_PAGEDOWN(id,func)" value=""/>
   <define name="EVT_COMMAND_SCROLL_THUMBTRACK(id,func)" value=""/>
-  <define name="EVT_COMMAND_SCROLL_THUMBRELEASE(func)" value=""/>
-  <define name="EVT_COMMAND_SCROLL_CHANGED(func)" value=""/>
+  <define name="EVT_COMMAND_SCROLL_THUMBRELEASE(id,func)" value=""/>
+  <define name="EVT_COMMAND_SCROLL_CHANGED(id,func)" value=""/>
   <define name="EVT_DPI_CHANGED(func)" value=""/>
   <define name="EVT_KILL_FOCUS(func)" value=""/>
   <define name="EVT_MOUSE_CAPTURE_CHANGED(func)" value=""/>
@@ -581,7 +581,7 @@
   <define name="wxCHECK2(condition, operation)" value=""/>
   <define name="wxCHECK(condition, retValue)" value=""/>
   <define name="wxFAIL_MSG(message)" value=""/>
-  <define name="wxUnusedVar(var)" value=""/>
+  <define name="wxUnusedVar(var)" value="(void)var"/>
   <define name="wxCOMPILE_TIME_ASSERT(condition, retValue)" value="assert(condition)"/>
   <define name="wxCHECK_MSG(condition, retValue, msg)" value=""/>
   <define name="wxCHECK_RET(condition, retValue)" value=""/>
@@ -7098,9 +7098,8 @@
   <function name="wxWindowBase::SetSizer,wxWindow::SetSizer,wxPanel::SetSizer,wxScrolledWindow::SetSizer,wxFrame::SetSizer">
     <noreturn>false</noreturn>
     <leak-ignore/>
-    <arg nr="1" direction="inout">
+    <arg nr="1" direction="in">
       <not-uninit/>
-      <not-null/>
     </arg>
     <arg nr="2" direction="in" default="true">
       <not-uninit/>
@@ -10102,12 +10101,8 @@
     <leak-ignore/>
     <noreturn>false</noreturn>
     <returnValue type="void"/>
-    <arg nr="1" direction="out">
-      <not-null/>
-    </arg>
-    <arg nr="2" direction="out">
-      <not-null/>
-    </arg>
+    <arg nr="1" direction="out"/>
+    <arg nr="2" direction="out"/>
   </function>
   <!-- virtual void wxGridCellRenderer::Draw(wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected) -->
   <!-- virtual void wxGridCellStringRenderer::Draw (wxGrid &grid, wxGridCellAttr &attr, wxDC &dc, const wxRect &rect, int row, int col, bool isSelected) -->