1. wxChoice and wxComboBox support client data under MSW

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index f17e964b680b8b7fd803506f5df5f8ade7206ad4..c119026190fc3039312275d01d5aea67554f4a58 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -111,7 +111,7 @@ static void SendTooltipMessageToAll(UINT msg, WPARAM wParam, LPARAM lParam)
             continue;
         }
 
-        wxASSERT_MSG( dialog || frame, "logic error" );
+        wxASSERT_MSG( dialog || frame, _T("logic error") );
 
         WXHWND hwndTT = frame ? frame->GetToolTipCtrl()
                               : dialog->GetToolTipCtrl();
@@ -173,7 +173,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
     }
 
     wxCHECK_MSG( frame || dialog, 0,
-                 "can't create tooltip control outside a frame or a dialog" );
+                 _T("can't create tooltip control outside a frame or a dialog") );
 
     HWND hwndTT = (HWND)(frame ? frame->GetToolTipCtrl()
                                : dialog->GetToolTipCtrl());
@@ -271,7 +271,7 @@ void wxToolTip::SetTip(const wxString& tip)
     {
         // update it immediately
         wxToolInfo ti(m_window);
-        ti.lpszText = (char *)m_text.c_str();
+        ti.lpszText = (wxChar *)m_text.c_str();
 
         (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, 0, &ti);
     }