fix for bug reported by Robert and Julian, probably causes other problems

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

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 2cc7626a4aab31a5c276ef52ee2cc414da2abb0a..f25d0943e75469a3ee10348cd67beba1de15dcbf 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -6,7 +6,7 @@
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Created:     08/09/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -87,6 +87,9 @@ 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)
 static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
 {
     if (push)


@@ -103,6 +106,7 @@ static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool pu
         node = node->Next();
     }
 }
         node = node->Next();
     }
 }

+#endif

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


@@ -122,8 +126,8 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
 
     m_status = FALSE;
 
 
     m_status = FALSE;
 

-//    win->PushEventHandler(new wxContextHelpEvtHandler(this));
-    wxPushOrPopEventHandlers(this, win, TRUE);
+    win->PushEventHandler(new wxContextHelpEvtHandler(this));
+    //wxPushOrPopEventHandlers(this, win, TRUE);

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


@@ -131,8 +135,8 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
 
     win->ReleaseMouse();
 
 
     win->ReleaseMouse();
 

-//    win->PopEventHandler(TRUE);
-    wxPushOrPopEventHandlers(this, win, FALSE);
+    win->PopEventHandler(TRUE);
+    //wxPushOrPopEventHandlers(this, win, FALSE);

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


@@ -140,14 +144,14 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     {
         wxPoint pt;
         wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
     {
         wxPoint pt;
         wxWindow* winAtPtr = wxFindWindowAtPointer(pt);

-       /*
+    /*

         if (winAtPtr)
         {
         if (winAtPtr)
         {

-       wxString msg;
+    wxString msg;

         msg.Printf("Picked %s (%d)", (const char*) winAtPtr->GetName(), winAtPtr->GetId());
         cout << msg << '\n';
         }
         msg.Printf("Picked %s (%d)", (const char*) winAtPtr->GetName(), winAtPtr->GetId());
         cout << msg << '\n';
         }

-       */
+    */

 
         if (winAtPtr)
             DispatchEvent(winAtPtr, pt);
 
         if (winAtPtr)
             DispatchEvent(winAtPtr, pt);


@@ -166,6 +170,7 @@ bool wxContextHelp::EndContextHelp()
 bool wxContextHelp::EventLoop()
 {
     m_inHelp = TRUE;
 bool wxContextHelp::EventLoop()
 {
     m_inHelp = TRUE;

+    

     while ( m_inHelp )
     {
         if (wxTheApp->Pending())
     while ( m_inHelp )
     {
         if (wxTheApp->Pending())


@@ -177,6 +182,7 @@ bool wxContextHelp::EventLoop()
             wxTheApp->ProcessIdle();
         }
     }
             wxTheApp->ProcessIdle();
         }
     }

+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -219,8 +225,9 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
     {
         wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
         helpEvent.SetEventObject(this);
     {
         wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
         helpEvent.SetEventObject(this);

+        

         eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
         eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);

-
+        

         // Go up the window hierarchy until the event is handled (or not).
         // I.e. keep submitting ancestor windows until one is recognised
         // by the app code that processes the ids and displays help.
         // Go up the window hierarchy until the event is handled (or not).
         // I.e. keep submitting ancestor windows until one is recognised
         // by the app code that processes the ids and displays help.


@@ -297,6 +304,11 @@ void wxHelpProvider::AddHelp(wxWindowID WXUNUSED(id),
 {
 }
 
 {
 }
 

+// removes the association
+void wxHelpProvider::RemoveHelp(wxWindowBase* WXUNUSED(window))
+{
+}
+

 wxHelpProvider::~wxHelpProvider()
 {
 }
 wxHelpProvider::~wxHelpProvider()
 {
 }


@@ -325,6 +337,12 @@ void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
     m_hashIds.Put(id, text);
 }
 
     m_hashIds.Put(id, text);
 }
 

+// removes the association
+void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window)
+{
+    m_hashWindows.Delete((long)window);
+}
+

 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {
 #if wxUSE_TIPWINDOW
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {
 #if wxUSE_TIPWINDOW