diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 5d5f7f200f..31af18593e 100644
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -384,6 +384,8 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 
         return true;
     }
+#else
+    wxUnusedVar(window);
 #endif // wxUSE_TIPWINDOW
 
     return false;
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 9ac2bce178..bab78b1520 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -184,7 +184,7 @@ bool wxHtmlHelpController::Initialize(const wxString& file)
     wxString dir, filename, ext;
     wxSplitPath(file, & dir, & filename, & ext);
 
-    if (!dir.IsEmpty())
+    if (!dir.empty())
         dir = dir + wxFILE_SEP_PATH;
 
     // Try to find a suitable file
@@ -239,6 +239,8 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
 
         return true;
     }
+#else
+    wxUnusedVar(text);
 #endif // wxUSE_TIPWINDOW
 
     return false;