Removed some superflous #defines already added by plaform.h, simplified a bit

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 930748cdbf1cf5b33ac47d6beaf93417fbf405fa..78b93e424cee918f3030f20ace63f968b7b8ecd0 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -77,7 +77,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 +95,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;

     }
 };
 
     }
 };
 


@@ -274,12 +275,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) )
     {


@@ -309,7 +312,7 @@ void wxToolTip::Add(WXHWND hWnd)
                     }
                 }
 
                     }
                 }
 

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

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


@@ -326,8 +329,6 @@ void wxToolTip::Add(WXHWND hWnd)
                     wxLogLastError(wxT("GetTextExtentPoint"));
                 }
 
                     wxLogLastError(wxT("GetTextExtentPoint"));
                 }
 

-                DeleteDC(hdc);
-

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


@@ -351,7 +352,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 )


@@ -392,6 +393,7 @@ void wxToolTip::SetWindow(wxWindow *win)
             Add(hwndComboEdit);
         }
     }
             Add(hwndComboEdit);
         }
     }

+#endif // !defined(__WXUNIVERSAL__)

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


@@ -400,7 +402,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();