ignore these

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 7829ec50e957bc18b4a1489b41b525fea6c120b3..c119026190fc3039312275d01d5aea67554f4a58 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -47,7 +47,11 @@ public:
     wxToolInfo(wxWindow *win)
     {
         // initialize all members
+#ifdef __GNUWIN32__
+        memset(this, 0, sizeof(TOOLINFO));
+#else
         ::ZeroMemory(this, sizeof(TOOLINFO));
+#endif
 
         cbSize = sizeof(TOOLINFO);
         uFlags = TTF_IDISHWND;
@@ -107,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();
@@ -169,10 +173,10 @@ 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());
+                               : dialog->GetToolTipCtrl());
     if ( !hwndTT )
     {
         hwndTT = ::CreateWindow(TOOLTIPS_CLASS,
@@ -180,7 +184,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
                                 TTS_ALWAYSTIP,
                                 CW_USEDEFAULT, CW_USEDEFAULT,
                                 CW_USEDEFAULT, CW_USEDEFAULT,
-                                (HWND)frame->GetHWND(), (HMENU)NULL,
+                                (HWND)parent->GetHWND(), (HMENU)NULL,
                                 wxGetInstance(), NULL);
 
         if ( hwndTT )
@@ -267,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);
     }