move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

[wxWidgets.git] / src / html / helpctrl.cpp

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 67726f7456e702e6607e4bbddde2be0c549a3acc..bab78b152062e51660a0d21f871f7c489e2a50dd 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "helpctrl.h"
 #endif
 
 #pragma implementation "helpctrl.h"
 #endif
 


@@ -39,6 +39,12 @@
     #include "wx/tipwin.h"
 #endif
 
     #include "wx/tipwin.h"
 #endif
 

+
+#if wxUSE_LIBMSPACK
+#include "wx/html/forcelnk.h"
+FORCE_LINK(wxhtml_chm_support)
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
 
 wxHtmlHelpController::wxHtmlHelpController(int style)
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
 
 wxHtmlHelpController::wxHtmlHelpController(int style)


@@ -105,8 +111,10 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;

+#else
+    wxUnusedVar(show_wait_msg);

 #endif
 #endif

-    if (m_helpFrame) 
+    if (m_helpFrame)

         m_helpFrame->RefreshLists();
     return retval;
 }
         m_helpFrame->RefreshLists();
     return retval;
 }


@@ -129,7 +137,7 @@ void wxHtmlHelpController::CreateHelpWindow()
 
     if (m_Config == NULL)
     {
 
     if (m_Config == NULL)
     {

-        m_Config = wxConfigBase::Get(FALSE);
+        m_Config = wxConfigBase::Get(false);

         if (m_Config != NULL)
             m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
     }
         if (m_Config != NULL)
             m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
     }


@@ -142,7 +150,8 @@ void wxHtmlHelpController::CreateHelpWindow()
 
     m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);
 
     m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
     m_helpFrame->SetTitleFormat(m_titleFormat);

-    m_helpFrame->Show(TRUE);
+
+    m_helpFrame->Show(true);

 }
 
 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
 }
 
 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)


@@ -175,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


@@ -187,17 +196,22 @@ bool wxHtmlHelpController::Initialize(const wxString& file)
         {
             actualFilename = dir + filename + wxString(wxT(".hhp"));
             if (!wxFileExists(actualFilename))
         {
             actualFilename = dir + filename + wxString(wxT(".hhp"));
             if (!wxFileExists(actualFilename))

-                return FALSE;
+            {
+#if wxUSE_LIBMSPACK
+                actualFilename = dir + filename + wxString(wxT(".chm"));
+                if (!wxFileExists(actualFilename))
+#endif
+                    return false;
+            }

         }
     }
         }
     }

-

     return AddBook(wxFileName(actualFilename));
 }
 
 bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
 {
     // Don't reload the file or we'll have it appear again, presumably.
     return AddBook(wxFileName(actualFilename));
 }
 
 bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
 {
     // Don't reload the file or we'll have it appear again, presumably.

-    return TRUE;
+    return true;

 }
 
 bool wxHtmlHelpController::DisplaySection(int sectionNo)
 }
 
 bool wxHtmlHelpController::DisplaySection(int sectionNo)


@@ -223,11 +237,13 @@ bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
     {
         s_tipWindow = new wxTipWindow(wxTheApp->GetTopWindow(), text, 100, & s_tipWindow);
 
     {
         s_tipWindow = new wxTipWindow(wxTheApp->GetTopWindow(), text, 100, & s_tipWindow);
 

-        return TRUE;
+        return true;

     }
     }

+#else
+    wxUnusedVar(text);

 #endif // wxUSE_TIPWINDOW
 
 #endif // wxUSE_TIPWINDOW
 

-    return FALSE;
+    return false;

 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,
 }
 
 void wxHtmlHelpController::SetFrameParameters(const wxString& title,


@@ -247,7 +263,7 @@ wxFrame* wxHtmlHelpController::GetFrameParameters(wxSize *size,
                                    bool *newFrameEachTime)
 {
     if (newFrameEachTime)
                                    bool *newFrameEachTime)
 {
     if (newFrameEachTime)

-        (* newFrameEachTime) = FALSE;
+        (* newFrameEachTime) = false;

     if (size && m_helpFrame)
         (* size) = m_helpFrame->GetSize();
     if (pos && m_helpFrame)
     if (size && m_helpFrame)
         (* size) = m_helpFrame->GetSize();
     if (pos && m_helpFrame)


@@ -258,7 +274,7 @@ wxFrame* wxHtmlHelpController::GetFrameParameters(wxSize *size,
 bool wxHtmlHelpController::Quit()
 {
     DestroyHelpWindow();
 bool wxHtmlHelpController::Quit()
 {
     DestroyHelpWindow();

-    return TRUE;
+    return true;

 }
 
 // Make the help controller's frame 'modal' if
 }
 
 // Make the help controller's frame 'modal' if


@@ -267,8 +283,8 @@ void wxHtmlHelpController::AddGrabIfNeeded()
 {
     // So far, wxGTK only
 #ifdef __WXGTK__
 {
     // So far, wxGTK only
 #ifdef __WXGTK__

-    bool needGrab = FALSE;
-    
+    bool needGrab = false;
+

     // Check if there are any modal windows present,
     // in which case we need to add a grab.
     for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     // Check if there are any modal windows present,
     // in which case we need to add a grab.
     for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();


@@ -279,7 +295,7 @@ void wxHtmlHelpController::AddGrabIfNeeded()
         wxDialog *dialog = wxDynamicCast(win, wxDialog);
 
         if (dialog && dialog->IsModal())
         wxDialog *dialog = wxDynamicCast(win, wxDialog);
 
         if (dialog && dialog->IsModal())

-            needGrab = TRUE;
+            needGrab = true;

     }
 
     if (needGrab && m_helpFrame)
     }
 
     if (needGrab && m_helpFrame)


@@ -292,7 +308,7 @@ bool wxHtmlHelpController::Display(const wxString& x)
     CreateHelpWindow();
     bool success = m_helpFrame->Display(x);
     AddGrabIfNeeded();
     CreateHelpWindow();
     bool success = m_helpFrame->Display(x);
     AddGrabIfNeeded();

-    return success;    
+    return success;

 }
 
 bool wxHtmlHelpController::Display(int id)
 }
 
 bool wxHtmlHelpController::Display(int id)


@@ -319,10 +335,11 @@ bool wxHtmlHelpController::DisplayIndex()
     return success;
 }
 
     return success;
 }
 

-bool wxHtmlHelpController::KeywordSearch(const wxString& keyword)
+bool wxHtmlHelpController::KeywordSearch(const wxString& keyword,
+                                         wxHelpSearchMode mode)

 {
     CreateHelpWindow();
 {
     CreateHelpWindow();

-    bool success = m_helpFrame->KeywordSearch(keyword);
+    bool success = m_helpFrame->KeywordSearch(keyword, mode);

     AddGrabIfNeeded();
     return success;
 }
     AddGrabIfNeeded();
     return success;
 }