Fix up NSSlider code to not use class posing and instantiate the proper type (now...

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index b18f806040035441e4d4900e1708ce08504be5e6..0e41099317b87a21805e171333cbe96adadcd2f2 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -28,6 +28,7 @@
 #include "wx/tooltip.h"
 
 #ifndef WX_PRECOMP
 #include "wx/tooltip.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

     #include "wx/app.h"
     #include "wx/control.h"
     #include "wx/combobox.h"
     #include "wx/app.h"
     #include "wx/control.h"
     #include "wx/combobox.h"


@@ -36,9 +37,6 @@
 #include "wx/tokenzr.h"
 #include "wx/msw/private.h"
 
 #include "wx/tokenzr.h"
 #include "wx/msw/private.h"
 

-// 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
 //     code here for now (but it's not compiled) in case we need it later.
 // VZ: normally, the trick with subclassing the tooltip control and processing
 //     TTM_WINDOWFROMPOINT should work but, somehow, it doesn't. I leave the
 //     code here for now (but it's not compiled) in case we need it later.


@@ -293,7 +291,7 @@ void wxToolTip::Add(WXHWND hWnd)
     // NMTTDISPINFO struct -- and setting the tooltip here we can have tooltips
     // of any length
     ti.hwnd = hwnd;
     // NMTTDISPINFO struct -- and setting the tooltip here we can have tooltips
     // of any length
     ti.hwnd = hwnd;

-    ti.lpszText = (wxChar *)m_text.c_str(); // const_cast
+    ti.lpszText = (wxChar *)m_text.wx_str(); // const_cast

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


@@ -341,13 +339,13 @@ void wxToolTip::Add(WXHWND hWnd)
                 while (token.length())
                 {
                     SIZE sz;
                 while (token.length())
                 {
                     SIZE sz;

-                    if ( !::GetTextExtentPoint32(hdc, token, token.length(), &sz) )
+                    if ( !::GetTextExtentPoint32(hdc, token.wx_str(), token.length(), &sz) )

                     {
                         wxLogLastError(wxT("GetTextExtentPoint32"));
                     }
                     if ( sz.cx > max )
                         max = sz.cx;
                     {
                         wxLogLastError(wxT("GetTextExtentPoint32"));
                     }
                     if ( sz.cx > max )
                         max = sz.cx;

-                    
+

                     token = tokenizer.GetNextToken();
                 }
 
                     token = tokenizer.GetNextToken();
                 }
 


@@ -362,7 +360,7 @@ 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(" "));
                 // 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
+                ti.lpszText = (wxChar *)m_text.wx_str(); // const_cast

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


@@ -436,7 +434,7 @@ void wxToolTip::SetTip(const wxString& tip)
     {
         // update the tip text shown by the control
         wxToolInfo ti(GetHwndOf(m_window));
     {
         // update the tip text shown by the control
         wxToolInfo ti(GetHwndOf(m_window));

-        ti.lpszText = (wxChar *)m_text.c_str();
+        ti.lpszText = (wxChar *)m_text.wx_str();

 
         (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
     }
 
         (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
     }