X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82ceade76a4913f9c6fd8dfda1fb291bf08e1d89..4a2d030adfa836f6ada1830c9057170d053bcc64:/src/msw/popupwin.cpp

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 20f337d99a..fbcf9961e6 100644
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/popupwin.cpp
+// Name:        src/msw/popupwin.cpp
 // Purpose:     implements wxPopupWindow for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.05.02
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +16,6 @@
 // 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"
 
@@ -28,12 +23,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_POPUPWIN
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif //WX_PRECOMP
 
-#if wxUSE_POPUPWIN
-
 #include "wx/popupwin.h"
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
@@ -95,6 +89,15 @@ WXHWND wxPopupWindow::MSWGetParent() const
 #endif
 }
 
+void wxPopupWindow::SetFocus()
+{
+    // Focusing on a popup window does not work on MSW unless WS_POPUP style is
+    // set (which is never the case currently, see the note in MSWGetParent()).
+    // We do not even want to try to set the focus, as it returns an error from
+    // SetFocus() on recent Windows versions (since Vista) and the resulting
+    // debug message is annoying.
+}
+
 bool wxPopupWindow::Show(bool show)
 {
     if ( !wxWindowMSW::Show(show) )
@@ -105,7 +108,7 @@ bool wxPopupWindow::Show(bool show)
         // raise to top of z order
         if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
         {
-            wxLogLastError(_T("SetWindowPos"));
+            wxLogLastError(wxT("SetWindowPos"));
         }
 
         // and set it as the foreground window so the mouse can be captured
@@ -116,4 +119,3 @@ bool wxPopupWindow::Show(bool show)
 }
 
 #endif // #if wxUSE_POPUPWIN
-