Set the focus to the html display window

[wxWidgets.git] / src / common / cshelp.cpp

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index cb9a8d895fabc48e7d9db76b4f999c16d5b46a98..43ebbef496ae20f7df9c44ce255f0904e39ed6bf 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -87,6 +87,27 @@ wxContextHelp::~wxContextHelp()
         EndContextHelp();
 }
 
         EndContextHelp();
 }
 

+// Not currently needed, but on some systems capture may not work as
+// expected so we'll leave it here for now.
+#if 0
+static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
+{
+    if (push)
+        win->PushEventHandler(new wxContextHelpEvtHandler(help));
+    else
+        win->PopEventHandler();
+
+    wxNode* node = win->GetChildren().First();
+    while (node)
+    {
+        wxWindow* child = (wxWindow*) node->Data();
+        wxPushOrPopEventHandlers(help, child, push);
+
+        node = node->Next();
+    }
+}
+#endif
+

 // Begin 'context help mode'
 bool wxContextHelp::BeginContextHelp(wxWindow* win)
 {
 // Begin 'context help mode'
 bool wxContextHelp::BeginContextHelp(wxWindow* win)
 {


@@ -103,7 +124,10 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     //    wxSetCursor(cursor);
 #endif
 
     //    wxSetCursor(cursor);
 #endif
 

+    m_status = FALSE;
+

     win->PushEventHandler(new wxContextHelpEvtHandler(this));
     win->PushEventHandler(new wxContextHelpEvtHandler(this));

+    //wxPushOrPopEventHandlers(this, win, TRUE);

 
     win->CaptureMouse();
 
 
     win->CaptureMouse();
 


@@ -112,6 +136,7 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     win->ReleaseMouse();
 
     win->PopEventHandler(TRUE);
     win->ReleaseMouse();
 
     win->PopEventHandler(TRUE);

+    //wxPushOrPopEventHandlers(this, win, FALSE);

 
     win->SetCursor(oldCursor);
 
 
     win->SetCursor(oldCursor);
 


@@ -173,7 +198,8 @@ bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
         (event.GetEventType() == wxEVT_ACTIVATE) ||
         (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
     {
         (event.GetEventType() == wxEVT_ACTIVATE) ||
         (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
     {

-        m_contextHelp->SetStatus(FALSE);
+        // May have already been set to TRUE by a left-click
+        //m_contextHelp->SetStatus(FALSE);

         m_contextHelp->EndContextHelp();
         return TRUE;
     }
         m_contextHelp->EndContextHelp();
         return TRUE;
     }


@@ -218,7 +244,7 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
  */
 
 #if !defined(__WXMSW__)
  */
 
 #if !defined(__WXMSW__)

-static char * csquery_xpm[] = {
+static const char * csquery_xpm[] = {

 "12 11 2 1",
 "  c None",
 ". c #000000",
 "12 11 2 1",
 "  c None",
 ". c #000000",


@@ -305,6 +331,7 @@ void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
 
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {
 
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {

+#if wxUSE_TIPWINDOW

     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)
     static wxTipWindow* s_tipWindow = NULL;
 
     if (s_tipWindow)


@@ -323,6 +350,7 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 
         return TRUE;
     }
 
         return TRUE;
     }

+#endif // wxUSE_TIPWINDOW

 
     return FALSE;
 }
 
     return FALSE;
 }