GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 6cddce9ae3b565234e353b67e143068bc337d14e..eb811168db18a0d2824a7d4c08915619d986e644 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -89,17 +89,13 @@ WXHWND wxPopupWindow::MSWGetParent() const
 
 bool wxPopupWindow::Show(bool show)
 {
-    if ( !wxWindowBase::Show(show) )
+    if ( !wxWindowMSW::Show(show) )
         return FALSE;
 
-    HWND hWnd = GetHwnd();
-    int cshow = show ? SW_SHOW : SW_HIDE;
-    ::ShowWindow(hWnd, cshow);
-
     if ( show )
     {
         // raise to top of z order
-        if (!::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+        if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
         {
             wxLogLastError(_T("SetWindowPos"));
         }