Compile fix.

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

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 7829ec50e957bc18b4a1489b41b525fea6c120b3..f17e964b680b8b7fd803506f5df5f8ade7206ad4 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -47,7 +47,11 @@ public:
     wxToolInfo(wxWindow *win)
     {
         // initialize all members
     wxToolInfo(wxWindow *win)
     {
         // initialize all members

+#ifdef __GNUWIN32__
+        memset(this, 0, sizeof(TOOLINFO));
+#else

         ::ZeroMemory(this, sizeof(TOOLINFO));
         ::ZeroMemory(this, sizeof(TOOLINFO));

+#endif

 
         cbSize = sizeof(TOOLINFO);
         uFlags = TTF_IDISHWND;
 
         cbSize = sizeof(TOOLINFO);
         uFlags = TTF_IDISHWND;


@@ -172,7 +176,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
                  "can't create tooltip control outside a frame or a dialog" );
 
     HWND hwndTT = (HWND)(frame ? frame->GetToolTipCtrl()
                  "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,
     if ( !hwndTT )
     {
         hwndTT = ::CreateWindow(TOOLTIPS_CLASS,


@@ -180,7 +184,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
                                 TTS_ALWAYSTIP,
                                 CW_USEDEFAULT, CW_USEDEFAULT,
                                 CW_USEDEFAULT, CW_USEDEFAULT,
                                 TTS_ALWAYSTIP,
                                 CW_USEDEFAULT, CW_USEDEFAULT,
                                 CW_USEDEFAULT, CW_USEDEFAULT,

-                                (HWND)frame->GetHWND(), (HMENU)NULL,
+                                (HWND)parent->GetHWND(), (HMENU)NULL,

                                 wxGetInstance(), NULL);
 
         if ( hwndTT )
                                 wxGetInstance(), NULL);
 
         if ( hwndTT )