Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows

[wxWidgets.git] / src / msw / tooltip.cpp

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 7189cd9b472a5d026413a27cc00d9a6ebbbf1c86..052fbca0b9e2b53016a1c35a8aa24b76e1130c2d 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -6,7 +6,7 @@
 // Created:     31.01.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Created:     31.01.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin

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

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


@@ -32,14 +32,8 @@
 #include "wx/tooltip.h"
 #include "wx/msw/private.h"
 
 #include "wx/tooltip.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && (!defined(__GNUWIN32_OLD__) || defined(__MINGW32__))
-    #include <commctrl.h>
-#endif
-
-#ifndef _WIN32_IE
-    // minimal set of features by default
-    #define _WIN32_IE 0x0200
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 // VZ: normally, the trick with subclassing the tooltip control and processing
 //     TTM_WINDOWFROMPOINT should work but, somehow, it doesn't. I leave the
 
 // VZ: normally, the trick with subclassing the tooltip control and processing
 //     TTM_WINDOWFROMPOINT should work but, somehow, it doesn't. I leave the


@@ -77,7 +71,7 @@ static WNDPROC gs_wndprocToolTip = (WNDPROC)NULL;
 class wxToolInfo : public TOOLINFO
 {
 public:
 class wxToolInfo : public TOOLINFO
 {
 public:

-    wxToolInfo(HWND hwnd)
+    wxToolInfo(HWND hwndOwner)

     {
         // initialize all members
         ::ZeroMemory(this, sizeof(TOOLINFO));
     {
         // initialize all members
         ::ZeroMemory(this, sizeof(TOOLINFO));


@@ -95,8 +89,9 @@ public:
         cbSize = sizeof(TOOLINFO);
 #endif // compile-time comctl32.dll version
 
         cbSize = sizeof(TOOLINFO);
 #endif // compile-time comctl32.dll version
 

+        hwnd = hwndOwner;

         uFlags = TTF_IDISHWND;
         uFlags = TTF_IDISHWND;

-        uId = (UINT)hwnd;
+        uId = (UINT)hwndOwner;

     }
 };
 
     }
 };
 


@@ -146,13 +141,13 @@ LRESULT APIENTRY wxToolTipWndProc(HWND hwndTT,
     {
         LPPOINT ppt = (LPPOINT)lParam;
 
     {
         LPPOINT ppt = (LPPOINT)lParam;
 

-        // the window on which event occured
+        // the window on which event occurred

         HWND hwnd = ::WindowFromPoint(*ppt);
 
         OutputDebugString("TTM_WINDOWFROMPOINT: ");
         OutputDebugString(wxString::Format("0x%08x => ", hwnd));
 
         HWND hwnd = ::WindowFromPoint(*ppt);
 
         OutputDebugString("TTM_WINDOWFROMPOINT: ");
         OutputDebugString(wxString::Format("0x%08x => ", hwnd));
 

-        // return a HWND corresponding to a wxWindow because only wxWindows are
+        // return a HWND corresponding to a wxWindow because only wxWidgets are

         // associated with tooltips using TTM_ADDTOOL
         wxWindow *win = wxGetWindowFromHWND((WXHWND)hwnd);
 
         // associated with tooltips using TTM_ADDTOOL
         wxWindow *win = wxGetWindowFromHWND((WXHWND)hwnd);
 


@@ -222,8 +217,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
 
 #if wxUSE_TTM_WINDOWFROMPOINT
            // subclass the newly created control
 
 #if wxUSE_TTM_WINDOWFROMPOINT
            // subclass the newly created control

-           gs_wndprocToolTip = (WNDPROC)::GetWindowLong(hwnd, GWL_WNDPROC);
-           ::SetWindowLong(hwnd, GWL_WNDPROC, (long)wxToolTipWndProc);
+           gs_wndprocToolTip = wxSetWindowProc(hwnd, wxToolTipWndProc);

 #endif // wxUSE_TTM_WINDOWFROMPOINT
        }
     }
 #endif // wxUSE_TTM_WINDOWFROMPOINT
        }
     }


@@ -240,6 +234,8 @@ void wxToolTip::RelayEvent(WXMSG *msg)
 // ctor & dtor
 // ----------------------------------------------------------------------------
 
 // ctor & dtor
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+

 wxToolTip::wxToolTip(const wxString &tip)
          : m_text(tip)
 {
 wxToolTip::wxToolTip(const wxString &tip)
          : m_text(tip)
 {


@@ -272,12 +268,14 @@ void wxToolTip::Add(WXHWND hWnd)
 
     wxToolInfo ti(hwnd);
 
 
     wxToolInfo ti(hwnd);
 

-    // as we store our text anyhow, it seems useless to waste system memory
-    // by asking the tooltip ctrl to remember it too - instead it will send
-    // us TTN_NEEDTEXT (via WM_NOTIFY) when it is about to be shown
+    // another possibility would be to specify LPSTR_TEXTCALLBACK here as we
+    // store the tooltip text ourselves anyhow, and provide it in response to
+    // TTN_NEEDTEXT (sent via WM_NOTIFY), but then we would be limited to 79
+    // character tooltips as this is the size of the szText buffer in
+    // NMTTDISPINFO struct -- and setting the tooltip here we can have tooltips
+    // of any length

     ti.hwnd = hwnd;
     ti.hwnd = hwnd;

-    ti.lpszText = LPSTR_TEXTCALLBACK;
-    // instead of: ti.lpszText = (char *)m_text.c_str();
+    ti.lpszText = (wxChar *)m_text.c_str(); // const_cast

 
     if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, 0, &ti) )
     {
 
     if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, 0, &ti) )
     {


@@ -290,10 +288,10 @@ void wxToolTip::Add(WXHWND hWnd)
 
         if ( index != wxNOT_FOUND )
         {
 
         if ( index != wxNOT_FOUND )
         {

-#if _WIN32_IE >= 0x0300
-            if ( wxTheApp->GetComCtl32Version() >= 470 )
+#ifdef TTM_SETMAXTIPWIDTH
+            if ( wxApp::GetComCtl32Version() >= 470 )

             {
             {

-                // use TTM_SETMAXWIDTH to make tooltip multiline using the
+                // use TTM_SETMAXTIPWIDTH to make tooltip multiline using the

                 // extent of its first line as max value
                 HFONT hfont = (HFONT)SendTooltipMessage(GetToolTipCtrl(),
                                                         WM_GETFONT,
                 // extent of its first line as max value
                 HFONT hfont = (HFONT)SendTooltipMessage(GetToolTipCtrl(),
                                                         WM_GETFONT,


@@ -307,7 +305,7 @@ void wxToolTip::Add(WXHWND hWnd)
                     }
                 }
 
                     }
                 }
 

-                HDC hdc = CreateCompatibleDC(NULL);
+                MemoryHDC hdc;

                 if ( !hdc )
                 {
                     wxLogLastError(wxT("CreateCompatibleDC(NULL)"));
                 if ( !hdc )
                 {
                     wxLogLastError(wxT("CreateCompatibleDC(NULL)"));


@@ -319,21 +317,27 @@ void wxToolTip::Add(WXHWND hWnd)
                 }
 
                 SIZE sz;
                 }
 
                 SIZE sz;

-                if ( !GetTextExtentPoint(hdc, m_text, index, &sz) )
+                if ( !::GetTextExtentPoint32(hdc, m_text, index, &sz) )

                 {
                 {

-                    wxLogLastError(wxT("GetTextExtentPoint"));
+                    wxLogLastError(wxT("GetTextExtentPoint32"));

                 }
 
                 }
 

-                DeleteDC(hdc);
-

                 SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH,
                                    0, (void *)sz.cx);
             }
                 SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH,
                                    0, (void *)sz.cx);
             }

+            else

 #endif // comctl32.dll >= 4.70
 #endif // comctl32.dll >= 4.70

+            {
+                // replace the '\n's with spaces because otherwise they appear as
+                // unprintable characters in the tooltip string
+                m_text.Replace(_T("\n"), _T(" "));
+                ti.lpszText = (wxChar *)m_text.c_str(); // const_cast

 
 

-            // replace the '\n's with spaces because otherwise they appear as
-            // unprintable characters in the tooltip string
-            m_text.Replace(_T("\n"), _T(" "));
+                if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, 0, &ti) )
+                {
+                    wxLogDebug(_T("Failed to create the tooltip '%s'"), m_text.c_str());
+                }
+            }

         }
     }
 }
         }
     }
 }


@@ -349,7 +353,7 @@ void wxToolTip::SetWindow(wxWindow *win)
     {
         Add(m_window->GetHWND());
     }
     {
         Add(m_window->GetHWND());
     }

-
+#if !defined(__WXUNIVERSAL__)

     // and all of its subcontrols (e.g. radiobuttons in a radiobox) as well
     wxControl *control = wxDynamicCast(m_window, wxControl);
     if ( control )
     // and all of its subcontrols (e.g. radiobuttons in a radiobox) as well
     wxControl *control = wxDynamicCast(m_window, wxControl);
     if ( control )


@@ -364,7 +368,7 @@ void wxToolTip::SetWindow(wxWindow *win)
             {
                 // may be it's a child of parent of the control, in fact?
                 // (radiobuttons are subcontrols, i.e. children of the radiobox
             {
                 // may be it's a child of parent of the control, in fact?
                 // (radiobuttons are subcontrols, i.e. children of the radiobox

-                // for wxWindows but are its siblings at Windows level)
+                // for wxWidgets but are its siblings at Windows level)

                 hwnd = GetDlgItem(GetHwndOf(m_window->GetParent()), id);
             }
 
                 hwnd = GetDlgItem(GetHwndOf(m_window->GetParent()), id);
             }
 


@@ -382,13 +386,15 @@ void wxToolTip::SetWindow(wxWindow *win)
     wxComboBox *combo = wxDynamicCast(control, wxComboBox);
     if ( combo )
     {
     wxComboBox *combo = wxDynamicCast(control, wxComboBox);
     if ( combo )
     {

-        WXHWND hwndComboEdit = combo->GetEditHWND();
+        WXHWND hwndComboEdit = combo->GetWindowStyle() & wxCB_READONLY
+                                ? combo->GetHWND()
+                                : combo->GetEditHWND();

         if ( hwndComboEdit )
         {
             Add(hwndComboEdit);
         }
         if ( hwndComboEdit )
         {
             Add(hwndComboEdit);
         }

-        //else: it's ok for a combo to be read only, of course

     }
     }

+#endif // !defined(__WXUNIVERSAL__)

 }
 
 void wxToolTip::SetTip(const wxString& tip)
 }
 
 void wxToolTip::SetTip(const wxString& tip)


@@ -397,7 +403,7 @@ void wxToolTip::SetTip(const wxString& tip)
 
     if ( m_window )
     {
 
     if ( m_window )
     {

-        // update it immediately
+        // update the tip text shown by the control

         wxToolInfo ti(GetHwndOf(m_window));
         ti.lpszText = (wxChar *)m_text.c_str();
 
         wxToolInfo ti(GetHwndOf(m_window));
         ti.lpszText = (wxChar *)m_text.c_str();