Filter index wasn't being set for multiple file dialog

[wxWidgets.git] / src / msw / helpwin.cpp

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index 74d9160f7fd2e583a8e7fb460ffe006b2b260ab1..abaa425609b7dbfe36620e2a780214ca006ac20c 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "helpwin.h"
 #endif
 
 #pragma implementation "helpwin.h"
 #endif
 


@@ -67,11 +67,10 @@ bool wxWinHelpController::DisplayContents(void)
     wxString str = GetValidFilename(m_helpFile);
     
 #if defined(__WIN95__)
     wxString str = GetValidFilename(m_helpFile);
     
 #if defined(__WIN95__)

-    WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L);
+    return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_FINDER, 0L) != 0);

 #else
 #else

-    WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_CONTENTS, 0L);
+    return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_CONTENTS, 0L) != 0);

 #endif
 #endif

-    return TRUE;

 }
 
 bool wxWinHelpController::DisplaySection(int section)
 }
 
 bool wxWinHelpController::DisplaySection(int section)


@@ -81,8 +80,16 @@ bool wxWinHelpController::DisplaySection(int section)
     
     wxString str = GetValidFilename(m_helpFile);
 
     
     wxString str = GetValidFilename(m_helpFile);
 

-    WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section);
-    return TRUE;
+    return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);
+}
+
+bool wxWinHelpController::DisplayContextPopup(int contextId)
+{
+    if (m_helpFile.IsEmpty()) return FALSE;
+    
+    wxString str = GetValidFilename(m_helpFile);
+
+    return (WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);

 }
 
 bool wxWinHelpController::DisplayBlock(long block)
 }
 
 bool wxWinHelpController::DisplayBlock(long block)


@@ -91,21 +98,20 @@ bool wxWinHelpController::DisplayBlock(long block)
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxWinHelpController::KeywordSearch(const wxString& k)
+bool wxWinHelpController::KeywordSearch(const wxString& k,
+                                        wxHelpSearchMode WXUNUSED(mode))

 {
     if (m_helpFile.IsEmpty()) return FALSE;
     
     wxString str = GetValidFilename(m_helpFile);
     
 {
     if (m_helpFile.IsEmpty()) return FALSE;
     
     wxString str = GetValidFilename(m_helpFile);
     

-    WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k);
-    return TRUE;
+    return (WinHelp(GetSuitableHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);

 }
 
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit(void)
 {
 }
 
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit(void)
 {

-    WinHelp(GetSuitableHWND(), 0, HELP_QUIT, 0L);
-    return TRUE;
+    return (WinHelp(GetSuitableHWND(), 0, HELP_QUIT, 0L) != 0);

 }
 
 // Append extension if necessary.
 }
 
 // Append extension if necessary.