Fixing focus problems with the combobox

views/controls/native_control_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "views/controls/native_control_win.h"
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "views/focus/focus_manager.h"
 
 namespace views {
 
 // static
 const wchar_t* NativeControlWin::kNativeControlWinKey =
     L"__NATIVE_CONTROL_WIN__";
 
-static const wchar_t* kNativeControlOriginalWndProcKey =
-    L"__NATIVE_CONTROL_ORIGINAL_WNDPROC__";
-
-// static
-WNDPROC NativeControlWin::original_wndproc_ = NULL;
-
 ////////////////////////////////////////////////////////////////////////////////
 // NativeControlWin, public:
 
 NativeControlWin::NativeControlWin() {
 }
 
 NativeControlWin::~NativeControlWin() {
   HWND hwnd = native_view();
   if (hwnd) {
     // Destroy the hwnd if it still exists. Otherwise we won't have shut things
@@ skipping 77 matching lines @@
   }
   View::ShowContextMenu(x, y, is_mouse);
 }
 
 void NativeControlWin::NativeControlCreated(HWND native_control) {
   // Associate this object with the control's HWND so that WidgetWin can find
   // this object when it receives messages from it.
   // Note that we never unset this property. We don't have to.
   SetProp(native_control, kNativeControlWinKey, this);
 
-  // Subclass the window so we can monitor for key presses. It's important that
-  // we *only* do this if the derived class wants to intercept keypresses,
-  // because otherwise the subclass can mysteriously interfere with certain
-  // other controls, like the combobox, and cause weird effects.
-  if (NotifyOnKeyDown()) {
-    original_wndproc_ =
-        win_util::SetWindowProc(native_control,
-                                &NativeControlWin::NativeControlWndProc);
-    SetProp(native_control, kNativeControlOriginalWndProcKey,
-            original_wndproc_);
-  }
+  // Subclass so we get WM_KEYDOWN and WM_SETFOCUS messages.
+  original_wndproc_ =
+      win_util::SetWindowProc(native_control,
+                              &NativeControlWin::NativeControlWndProc);
 
   Attach(native_control);
   // native_view() is now valid.
 
   // Update the newly created HWND with any resident enabled state.
   EnableWindow(native_view(), IsEnabled());
 
   // This message ensures that the focus border is shown.
   SendMessage(native_view(), WM_CHANGEUISTATE,
               MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0);
@@ skipping 42 matching lines @@
 
 // static
 LRESULT NativeControlWin::NativeControlWndProc(HWND window,
                                                UINT message,
                                                WPARAM w_param,
                                                LPARAM l_param) {
   NativeControlWin* native_control =
       static_cast<NativeControlWin*>(GetProp(window, kNativeControlWinKey));
   DCHECK(native_control);
 
-  if (message == WM_KEYDOWN && native_control->NotifyOnKeyDown()) {
-    if (native_control->OnKeyDown(static_cast<int>(w_param)))
+  if (message == WM_KEYDOWN &&
+      native_control->OnKeyDown(static_cast<int>(w_param))) {
       return 0;
   } else if (message == WM_SETFOCUS) {
     // Let the focus manager know that the focus changed.
     FocusManager* focus_manager =
         FocusManager::GetFocusManager(native_control->native_view());
     if (focus_manager) {
       focus_manager->SetFocusedView(native_control->focus_view());
     } else {
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
     win_util::SetWindowProc(window, native_control->original_wndproc_);
   }
 
   return CallWindowProc(native_control->original_wndproc_, window, message,
                         w_param, l_param);
 }
 
 }  // namespace views