diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index ee5978722..f15f4723c 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -1065,7 +1065,7 @@
     </arg>
     <warn severity="style">This function should be used instead of changing 'wxCAL_NO_YEAR_CHANGE' style bit directly. It allows or disallows the user to change the year interactively. Only in generic 'wxCalendarCtrl'.</warn>
   </function>
-  <!-- http://docs.wxwidgets.org/trunk/classwx_calendar_ctrl.html#ab2e1f2d643c4a48f3d5cb2273e3a6e13 -->
+  <!-- http://docs.wxwidgets.org/trunk/classwx_combo_ctrl.html#ae38353a81954d02af302ba103e984cb73 -->
   <!-- wxCoord wxComboCtrl::GetTextIndent( ) const-->
   <function name="wxComboCtrl::GetTextIndent">
     <noreturn>false</noreturn>
@@ -1074,6 +1074,33 @@
     <returnValue type="wxCoord"/>
     <warn severity="style">This function is deprecated and kept mostly for backwards compatibility. Please override 'GetMargins()' method instead in any new code.</warn>
   </function>
+  <!-- http://docs.wxwidgets.org/trunk/classwx_combo_ctrl.html#ae38353a81954d02af302ba103e984cb7 -->
+  <!-- void wxComboCtrl::HidePopup (bool generateEvent=false)-->
+  <function name="wxComboCtrl::HidePopup">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1" default="false">
+      <not-uninit/>
+    </arg>
+    <warn severity="style">This function is deprecated and kept mostly for backwards compatibility. Please override 'Dismiss()' method instead in any new code.</warn>
+  </function>
+  <!-- http://docs.wxwidgets.org/trunk/classwx_combo_ctrl.html#ae38353a81954d02af302ba103e984cb7 -->
+  <!-- virtual void wxComboCtrl::ShowPopup() -->
+  <function name="wxComboCtrl::ShowPopup">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <warn severity="style">This function is deprecated and kept mostly for backwards compatibility. Please override 'Popup()' method instead in any new code.</warn>
+  </function>
+  <!-- http://docs.wxwidgets.org/trunk/classwx_combo_ctrl.html#ae38353a81954d02af302ba103e984cb7 -->
+  <!-- void wxComboCtrl::SetTextIndent(int indent) -->
+  <function name="wxComboCtrl::SetTextIndent">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <warn severity="style">This function is deprecated and kept mostly for backwards compatibility. Please override 'SetMargins()' method instead in any new code.</warn>
+  </function>
   <!-- Override macros which don't necessarily require semicolons at the end -->
   <define name="DECLARE_CLASS(n)" value=""/>
   <define name="DECLARE_DYNAMIC_CLASS(n)" value=""/>
diff --git a/test/cfg/wxwidgets.cpp b/test/cfg/wxwidgets.cpp
index a95596139..1db8076d3 100644
--- a/test/cfg/wxwidgets.cpp
+++ b/test/cfg/wxwidgets.cpp
@@ -84,17 +84,39 @@ void deprecatedFunctions(wxApp &a, const wxString &s, wxArtProvider *artProvider
     // cppcheck-suppress MacOpenFileCalled
     a.MacOpenFile(s);
 #endif
+
+#if wxCHECK_VERSION(3, 1, 0)  // wxWidets-3.1.0 or higher:
+    // Some functions are not available anymore in newer versions
+
+    // @todo cppcheck-suppress ShowPopupCalled
+    comboCtrl.ShowPopup();
+#else
     // cppcheck-suppress InsertCalled
     wxArtProvider::Insert(artProvider);
+
+    // cppcheck-suppress GetTextIndentCalled
+    // cppcheck-suppress ignoredReturnValue
+    comboCtrl.GetTextIndent();
+
+    // cppcheck-suppress HidePopupCalled
+    comboCtrl.HidePopup(true);
+    // cppcheck-suppress HidePopupCalled
+    comboCtrl.HidePopup(false);
+    // cppcheck-suppress HidePopupCalled
+    comboCtrl.HidePopup(/*default=false*/);
+
+    // cppcheck-suppress SetTextIndentCalled
+    comboCtrl.SetTextIndent(0);
+#endif
+
 #if defined(__WXMSW__) || defined(__WXGTK__)
     // EnableYearChange() is not available on these GUI systems
 #else
     // cppcheck-suppress EnableYearChangeCalled
     calenderCtrl.EnableYearChange(false);
     // cppcheck-suppress EnableYearChangeCalled
+    calenderCtrl.EnableYearChange(true);
+    // cppcheck-suppress EnableYearChangeCalled
     calenderCtrl.EnableYearChange(/*default=yes*/);
 #endif
-    // cppcheck-suppress GetTextIndentCalled
-    // cppcheck-suppress ignoredReturnValue
-    comboCtrl.GetTextIndent();
 }