Incomplete wxUSE_* warning fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 5d5f7f200f398aea09c541104d2eca86d7ece2e2..31af18593eccb88fb6c91207a4619f393198d0d6 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -384,6 +384,8 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 
         return true;
     }
 
         return true;
     }

+#else
+    wxUnusedVar(window);

 #endif // wxUSE_TIPWINDOW
 
     return false;
 #endif // wxUSE_TIPWINDOW
 
     return false;

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 9ac2bce17817b5dc822914d653560a054b800cf7..bab78b152062e51660a0d21f871f7c489e2a50dd 100644 (file)
--- 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);
 
     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
         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;
     }
 
         return true;
     }

+#else
+    wxUnusedVar(text);

 #endif // wxUSE_TIPWINDOW
 
     return false;
 #endif // wxUSE_TIPWINDOW
 
     return false;