fixed the error '& may not appear in macro parameter list' reported by running gcc...

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

diff --git a/src/common/cshelp.cpp b/src/common/cshelp.cpp
index c24b709e988037a0eb7d60410fff47c05baa0d11..4a02253a002c0f1d2b2698e4c8a2bc8f0db32457 100644 (file)
--- a/src/common/cshelp.cpp
+++ b/src/common/cshelp.cpp
@@ -123,8 +123,8 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
     wxCursor oldCursor = win->GetCursor();
     win->SetCursor(cursor);
 
     wxCursor oldCursor = win->GetCursor();
     win->SetCursor(cursor);
 

-#ifdef __WXMSW__
-    //    wxSetCursor(cursor);
+#ifdef __WXMAC__
+    wxSetCursor(cursor);

 #endif
 
     m_status = false;
 #endif
 
     m_status = false;


@@ -149,6 +149,10 @@ bool wxContextHelp::BeginContextHelp(wxWindow* win)
 
     win->SetCursor(oldCursor);
 
 
     win->SetCursor(oldCursor);
 

+#ifdef __WXMAC__
+    wxSetCursor(wxNullCursor);
+#endif
+

     if (m_status)
     {
         wxPoint pt;
     if (m_status)
     {
         wxPoint pt;


@@ -384,6 +388,11 @@ void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window)
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {
 #if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW
 bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
 {
 #if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW

+#if wxUSE_MS_HTML_HELP
+    // m_helptextAtPoint will be reset by GetHelpTextMaybeAtPoint(), stash it
+    const wxPoint posTooltip = m_helptextAtPoint;
+#endif // wxUSE_MS_HTML_HELP
+

     const wxString text = GetHelpTextMaybeAtPoint(window);
 
     if ( !text.empty() )
     const wxString text = GetHelpTextMaybeAtPoint(window);
 
     if ( !text.empty() )


@@ -393,7 +402,7 @@ bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
         if ( !wxCHMHelpController::ShowContextHelpPopup
                                    (
                                         text,
         if ( !wxCHMHelpController::ShowContextHelpPopup
                                    (
                                         text,

-                                        wxGetMousePosition(),
+                                        posTooltip,

                                         (wxWindow *)window
                                    ) )
 #endif // wxUSE_MS_HTML_HELP
                                         (wxWindow *)window
                                    ) )
 #endif // wxUSE_MS_HTML_HELP