fixed bug due to missing break in GetColourFromGTKWidget() (part of patch 1160117)

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

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index fbe5ad21fbcc156a45dda4da88186c7227dc0bc6..78a9a676bf084e69c0ac7e868c4e87bc70283879 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -38,16 +38,17 @@
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 
-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-
 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {
+    // popup windows are created hidden by default
+    Hide();
+
     return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
+               wxWindow::Create(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }
@@ -97,7 +98,7 @@ WXHWND wxPopupWindow::MSWGetParent() const
 bool wxPopupWindow::Show(bool show)
 {
     if ( !wxWindowMSW::Show(show) )
-        return FALSE;
+        return false;
 
     if ( show )
     {
@@ -108,7 +109,7 @@ bool wxPopupWindow::Show(bool show)
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 #endif // #if wxUSE_POPUPWIN