better focus handling (blind fix)

[wxWidgets.git] / src / generic / helpwxht.cpp

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 955dcd87e8f2d31fdf5fd018d3390b2c1ef7a0bf..7b3a9c9d70b7bf154ec27fee2f71ea51b8cc25b3 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -19,15 +19,16 @@
 #   pragma hdrstop
 #endif
 
 #   pragma hdrstop
 #endif
 

-#if wxUSE_HTML
+#if wxUSE_WXHTML_HELP

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#   include "wx/string.h"
-#   include "wx/utils.h"
-#   include "wx/list.h"
-#   include "wx/intl.h"
-#   include "wx/layout.h"
-#   include "wx/combobox.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/list.h"
+    #include "wx/intl.h"
+    #include "wx/layout.h"
+    #include "wx/combobox.h"
+    #include "wx/button.h"

 #endif
 
 #include "wx/helpbase.h"
 #endif
 
 #include "wx/helpbase.h"


@@ -130,7 +131,7 @@ wxHelpFrame::OnButton(wxCommandEvent &ev)
    else if(id == m_IdSearch)
    {
       wxString str = m_combo->GetValue();
    else if(id == m_IdSearch)
    {
       wxString str = m_combo->GetValue();

-      if(m_combo->FindString(str) == -1 && m_combo->Number() < MAX_COMBO_ENTRIES)
+      if(m_combo->FindString(str) == -1 && m_combo->GetCount() < MAX_COMBO_ENTRIES)

          m_combo->Append(str);
       m_controller->KeywordSearch(str);
    }
          m_combo->Append(str);
       m_controller->KeywordSearch(str);
    }


@@ -266,7 +267,7 @@ wxHelpControllerHtml::~wxHelpControllerHtml(void)
 #endif
 
 bool
 #endif
 
 bool

-wxHelpControllerHtml::DisplayHelp(wxString const &relativeURL)
+wxHelpControllerHtml::DisplayHelp(const wxString &relativeURL)

 {
    wxBusyCursor b; // display a busy cursor
 
 {
    wxBusyCursor b; // display a busy cursor
 


@@ -314,4 +315,5 @@ wxHelpControllerHtml::GetFrameParameters(wxSize *size,
    return m_Frame;
 }
 
    return m_Frame;
 }
 

-#endif // wxUSE_HTML
+#endif // wxUSE_WXHTML_HELP
+