Fix best size computation for buttons without image and with empty label.

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 351f44ff6fd698944c199a8474ab17ad5fc63cc6..f43fed3843e996d8ccc8339aa913b10169feb895 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -83,7 +83,7 @@ static WNDPROC gs_wndprocToolTip = (WNDPROC)NULL;
 class wxToolInfo : public TOOLINFO
 {
 public:
-    wxToolInfo(HWND hwndOwner)
+    wxToolInfo(HWND hwndOwner, unsigned int id, const wxRect& rc)
     {
         // initialize all members
         ::ZeroMemory(this, sizeof(TOOLINFO));
@@ -95,7 +95,27 @@ public:
         cbSize = TTTOOLINFO_V1_SIZE;
 
         hwnd = hwndOwner;
-        uFlags = TTF_IDISHWND;
+
+        if (rc.IsEmpty())
+        {
+            uFlags = TTF_IDISHWND;
+            uId = (UINT_PTR)hwndOwner;
+        }
+        else
+        {
+            // this tooltip must be shown only if the mouse hovers a specific rect
+            // of the hwnd parameter!
+            rect.left = rc.GetLeft();
+            rect.right = rc.GetRight();
+            rect.top = rc.GetTop();
+            rect.bottom = rc.GetBottom();
+
+            // note that not setting TTF_IDISHWND from the uFlags member means that the
+            // ti.uId field should not contain the HWND but rather as MSDN says an
+            // "Application-defined identifier of the tool"; this is used internally by
+            // Windows to distinguish the different tooltips attached to the same window
+            uId = id;
+        }
 
         // we use TTF_TRANSPARENT to fix a problem which arises at least with
         // the text controls but may presumably happen with other controls
@@ -107,8 +127,6 @@ public:
         {
             uFlags |= TTF_TRANSPARENT;
         }
-
-        uId = (UINT_PTR)hwndOwner;
     }
 };
 
@@ -197,11 +215,17 @@ LRESULT APIENTRY wxToolTipWndProc(HWND hwndTT,
 
 void wxToolTip::Enable(bool flag)
 {
+    // Make sure the tooltip has been created
+    (void) GetToolTipCtrl();
+
     SendTooltipMessageToAll(ms_hwndTT, TTM_ACTIVATE, flag, 0);
 }
 
 void wxToolTip::SetDelay(long milliseconds)
 {
+    // Make sure the tooltip has been created
+    (void) GetToolTipCtrl();
+
     SendTooltipMessageToAll(ms_hwndTT, TTM_SETDELAYTIME,
                             TTDT_INITIAL, milliseconds);
 }
@@ -220,7 +244,7 @@ void wxToolTip::SetReshow(long milliseconds)
 
 void wxToolTip::SetMaxWidth(int width)
 {
-    wxASSERT_MSG( width == -1 || width >= 0, _T("invalid width value") );
+    wxASSERT_MSG( width == -1 || width >= 0, wxT("invalid width value") );
 
     ms_maxWidth = width;
 }
@@ -284,6 +308,21 @@ wxToolTip::wxToolTip(const wxString &tip)
          : m_text(tip)
 {
     m_window = NULL;
+
+    // make sure m_rect.IsEmpty() == true
+    m_rect.SetWidth(0);
+    m_rect.SetHeight(0);
+
+    // since m_rect is not valid, m_id is ignored by wxToolInfo ctor...
+    m_id = 0;
+}
+
+wxToolTip::wxToolTip(wxWindow* win, unsigned int id, const wxString &tip, const wxRect& rc)
+         : m_text(tip), m_rect(rc), m_id(id)
+{
+    m_window = NULL;
+
+    SetWindow(win);
 }
 
 wxToolTip::~wxToolTip()
@@ -297,9 +336,11 @@ wxToolTip::~wxToolTip()
 // others
 // ----------------------------------------------------------------------------
 
-void wxToolTip::Remove(WXHWND hWnd)
+/* static */
+void wxToolTip::Remove(WXHWND hWnd, unsigned int id, const wxRect& rc)
 {
-    wxToolInfo ti((HWND)hWnd);
+    wxToolInfo ti((HWND)hWnd, id, rc);
+
     (void)SendTooltipMessage(GetToolTipCtrl(), TTM_DELTOOL, &ti);
 }
 
@@ -308,7 +349,7 @@ void wxToolTip::Remove()
     // remove this tool from the tooltip control
     if ( m_window )
     {
-        Remove(m_window->GetHWND());
+        Remove(m_window->GetHWND(), m_id, m_rect);
     }
 }
 
@@ -316,7 +357,7 @@ void wxToolTip::Add(WXHWND hWnd)
 {
     HWND hwnd = (HWND)hWnd;
 
-    wxToolInfo ti(hwnd);
+    wxToolInfo ti(hwnd, m_id, m_rect);
 
     // another possibility would be to specify LPSTR_TEXTCALLBACK here as we
     // store the tooltip text ourselves anyhow, and provide it in response to
@@ -329,7 +370,7 @@ void wxToolTip::Add(WXHWND hWnd)
 
     if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
     {
-        wxLogDebug(_T("Failed to create the tooltip '%s'"), m_text.c_str());
+        wxLogDebug(wxT("Failed to create the tooltip '%s'"), m_text.c_str());
 
         return;
     }
@@ -364,7 +405,7 @@ void wxToolTip::Add(WXHWND hWnd)
 
         // find the width of the widest line
         int maxWidth = 0;
-        wxStringTokenizer tokenizer(m_text, _T("\n"));
+        wxStringTokenizer tokenizer(m_text, wxT("\n"));
         while ( tokenizer.HasMoreTokens() )
         {
             const wxString token = tokenizer.GetNextToken();
@@ -411,12 +452,12 @@ void wxToolTip::Add(WXHWND hWnd)
     {
         // replace the '\n's with spaces because otherwise they appear as
         // unprintable characters in the tooltip string
-        m_text.Replace(_T("\n"), _T(" "));
+        m_text.Replace(wxT("\n"), wxT(" "));
         ti.lpszText = const_cast<wxChar *>(m_text.wx_str());
 
         if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
         {
-            wxLogDebug(_T("Failed to create the tooltip '%s'"), m_text.c_str());
+            wxLogDebug(wxT("Failed to create the tooltip '%s'"), m_text.c_str());
         }
     }
 }
@@ -452,7 +493,7 @@ void wxToolTip::SetWindow(wxWindow *win)
             }
 
             // must have it by now!
-            wxASSERT_MSG( hwnd, _T("no hwnd for subcontrol?") );
+            wxASSERT_MSG( hwnd, wxT("no hwnd for subcontrol?") );
 
             Add((WXHWND)hwnd);
         }
@@ -460,6 +501,17 @@ void wxToolTip::SetWindow(wxWindow *win)
 #endif // !defined(__WXUNIVERSAL__)
 }
 
+void wxToolTip::SetRect(const wxRect& rc)
+{
+    m_rect = rc;
+
+    if ( m_window )
+    {
+        wxToolInfo ti(GetHwndOf(m_window), m_id, m_rect);
+        (void)SendTooltipMessage(GetToolTipCtrl(), TTM_NEWTOOLRECT, &ti);
+    }
+}
+
 void wxToolTip::SetTip(const wxString& tip)
 {
     m_text = tip;
@@ -467,12 +519,12 @@ void wxToolTip::SetTip(const wxString& tip)
     if ( m_window )
     {
         // update the tip text shown by the control
-        wxToolInfo ti(GetHwndOf(m_window));
+        wxToolInfo ti(GetHwndOf(m_window), m_id, m_rect);
 
         // for some reason, changing the tooltip text directly results in
         // repaint of the controls under it, see #10520 -- but this doesn't
         // happen if we reset it first
-        ti.lpszText = const_cast<wxChar *>(_T(""));
+        ti.lpszText = const_cast<wxChar *>(wxT(""));
         (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
 
         ti.lpszText = const_cast<wxChar *>(m_text.wx_str());