From 6aff1c8c6484ca6ef06f541a84808468ff909862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Va=CC=81clav=20Slavi=CC=81k?= <vaclav@slavik.io>
Date: Thu, 2 Feb 2017 18:22:05 +0100
Subject: [PATCH] Compilation and warnings fixes for wxUSE_HELP=0

---
 src/common/wincmn.cpp    | 2 ++
 src/generic/datavgen.cpp | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 7bbc1caad6..e49f40423a 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -3887,6 +3887,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString*
 {
     wxCHECK( GetWindow() != NULL, wxACC_FAIL );
 
+    (void)description;
 #if wxUSE_HELP
     wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
     if (!ht.empty())
@@ -3904,6 +3905,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* hel
 {
     wxCHECK( GetWindow() != NULL, wxACC_FAIL );
 
+    (void)helpText;
 #if wxUSE_HELP
     wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
     if (!ht.empty())
diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index b7e3c0e8ad..7e2c3f260e 100644
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -6093,6 +6093,7 @@ wxAccStatus wxDataViewCtrlAccessible::GetHelpText(int childId, wxString* helpTex
     wxDataViewCtrl* dvCtrl = wxDynamicCast(GetWindow(), wxDataViewCtrl);
     wxCHECK( dvCtrl, wxACC_FAIL );
 
+#if wxUSE_HELP
     if ( childId == wxACC_SELF )
     {
         *helpText = dvCtrl->GetHelpText();
@@ -6112,6 +6113,11 @@ wxAccStatus wxDataViewCtrlAccessible::GetHelpText(int childId, wxString* helpTex
         }
     }
     return wxACC_OK;
+#else
+    (void)childId;
+    (void)helpText;
+    return wxACC_NOT_IMPLEMENTED;
+#endif
 }
 
 // Returns the keyboard shortcut for this object or child.