Make public headers compatible with Objective-C++ with ARC.

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

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index d28e3cdfa616d8a38e08caebf3c82b08eda20954..fbcf9961e69c4a14c5caa591fa9aed95904af621 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -4,9 +4,8 @@
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -90,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) )
@@ -100,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