wxMotif fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index 9e41da6a8acb805e420cee301e68e602cfbf4109..6267f85db0fc95d6c9d899b99c5a543a75da5209 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -91,21 +91,21 @@ wxContextHelp::~wxContextHelp()
 
 // Not currently needed, but on some systems capture may not work as
 // expected so we'll leave it here for now.
 
 // Not currently needed, but on some systems capture may not work as
 // expected so we'll leave it here for now.

-#if 0
+#ifdef __WXMOTIF__

 static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
 {
     if (push)
         win->PushEventHandler(new wxContextHelpEvtHandler(help));
     else
 static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
 {
     if (push)
         win->PushEventHandler(new wxContextHelpEvtHandler(help));
     else

-        win->PopEventHandler();
+        win->PopEventHandler(TRUE);

 
 

-    wxNode* node = win->GetChildren().First();
+    wxWindowList::Node* node = win->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* child = (wxWindow*) node->Data();
+        wxWindow* child = node->GetData();

         wxPushOrPopEventHandlers(help, child, push);
 
         wxPushOrPopEventHandlers(help, child, push);
 

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 #endif
     }
 }
 #endif


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

+#ifdef __WXMOTIF__
+    wxPushOrPopEventHandlers(this, win, TRUE);
+#else

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

-    //wxPushOrPopEventHandlers(this, win, TRUE);
+#endif

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


@@ -137,8 +140,11 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
 
     win->ReleaseMouse();
 
 
     win->ReleaseMouse();
 

+#ifdef __WXMOTIF__
+    wxPushOrPopEventHandlers(this, win, FALSE);
+#else

     win->PopEventHandler(TRUE);
     win->PopEventHandler(TRUE);

-    //wxPushOrPopEventHandlers(this, win, FALSE);
+#endif

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


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

-    /*
+
+#if 0

         if (winAtPtr)
         {
         if (winAtPtr)
         {

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

         }
         }

-    */
+#endif

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