extracted wxFrame::MSWTranslateMessage() implementation into new MSWDoTranslateMessag...

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

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index f19637098bc82e7eadd9acdfb109607640298586..b4586d291b83598e7115b9e37ad3b1755160bf01 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "popup.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/defs.h"

 #endif //WX_PRECOMP
 
 #if wxUSE_POPUPWIN
 #endif //WX_PRECOMP
 
 #if wxUSE_POPUPWIN


@@ -37,16 +34,17 @@
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 

-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {
 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {

+    // popup windows are created hidden by default
+    Hide();
+

     return wxPopupWindowBase::Create(parent) &&
     return wxPopupWindowBase::Create(parent) &&

-               wxWindow::Create(parent, -1,
+               wxWindow::Create(parent, wxID_ANY,

                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }
                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }


@@ -96,7 +94,7 @@ WXHWND wxPopupWindow::MSWGetParent() const
 bool wxPopupWindow::Show(bool show)
 {
     if ( !wxWindowMSW::Show(show) )
 bool wxPopupWindow::Show(bool show)
 {
     if ( !wxWindowMSW::Show(show) )

-        return FALSE;
+        return false;

 
     if ( show )
     {
 
     if ( show )
     {


@@ -105,9 +103,12 @@ bool wxPopupWindow::Show(bool show)
         {
             wxLogLastError(_T("SetWindowPos"));
         }
         {
             wxLogLastError(_T("SetWindowPos"));
         }

+
+        // and set it as the foreground window so the mouse can be captured
+        ::SetForegroundWindow(GetHwnd());

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 #endif // #if wxUSE_POPUPWIN
 }
 
 #endif // #if wxUSE_POPUPWIN