Do not #undef wxNEED_PRINTF_CONVERSION if wxVsnprintf_ has not been defined

[wxWidgets.git] / include / wx / msw / wince / helpwce.h

diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h
index f1de58b63214ca902e4ace2e50d4b8d74dffeff0..2076ee2090fdc20abfdac668b0bca86fb97c495d 100644 (file)
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -12,7 +12,7 @@
 #ifndef _WX_HELPWCE_H_
 #define _WX_HELPWCE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "helpwce.cpp"
 #endif
 
@@ -37,7 +37,8 @@ public:
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
-    virtual bool KeywordSearch(const wxString& k);
+    virtual bool KeywordSearch(const wxString& k,
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
     virtual bool Quit();
 
     wxString GetHelpFile() const { return m_helpFile; }